Changeset 10445 in josm for trunk

Timestamp:

2016-06-21T00:32:25+02:00 (8 years ago)

Author:

Don-vip

Message:

fix NPE in JOSMTestRules + ignore findbugs warning

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -19 +19 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -216 +218 @@
      * Clean up what test not using these test rules may have broken.
      */
+    @SuppressFBWarnings("DM_GC")
     private void cleanUpFromJosmFixture() {
         Main.getLayerManager().resetState();
         Main.pref = null;
         Main.platform = null;
-        Main.pref.put("osm-server.url", "invalid-server");
         System.gc();
     }
@@ -227 +229 @@
      * Clean up after running a test
      */
+    @SuppressFBWarnings("DM_GC")
     protected void after() {
         // Sync AWT Thread