Changeset 9671 in josm for trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

Timestamp:

2016-01-29T19:36:59+01:00 (8 years ago)

Author:

Don-vip

Message:

fix/cleanup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

@@ -43 +43 @@
         try (InputStream is = TestUtils.getRegressionDataStream(12038, "data.osm")) {
             DataSet ds = OsmReader.parseDataSet(is, null);
-            Main.map.mapView.addLayer(new OsmDataLayer(ds, null, null));
-            for (Way w : ds.getWays()) {
-                if (w.getId() == 222191929L) {
-                    ds.addSelected(w);
+            OsmDataLayer layer = new OsmDataLayer(ds, null, null);
+            Main.main.addLayer(layer);
+            try {
+                for (Way w : ds.getWays()) {
+                    if (w.getId() == 222191929L) {
+                        ds.addSelected(w);
+                    }
                 }
-            }
-            new PurgeAction().actionPerformed(null);
-            for (Way w : ds.getWays()) {
-                if (w.getId() == 222191929L) {
-                    assertTrue(w.isIncomplete());
-                    assertEquals(0, w.getNodesCount());
+                new PurgeAction().actionPerformed(null);
+                for (Way w : ds.getWays()) {
+                    if (w.getId() == 222191929L) {
+                        assertTrue(w.isIncomplete());
+                        assertEquals(0, w.getNodesCount());
+                    }
                 }
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                Main.main.removeLayer(layer);
             }
         }