Changeset 9661 in josm for trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java

Timestamp:

2016-01-28T09:29:14+01:00 (8 years ago)

Author:

Don-vip

Message:

fix/cleanup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java (modified) (3 diffs)

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

@@ -79 +79 @@
     public void testGetSurroundingObjects() {
         Layer layer = initDataSet();
-        assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(null).size());
-        assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(0, 0)).size());
-        assertEquals(1, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(1.5, 1.5)).size());
-        assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(3, 3)).size());
-        Main.main.removeLayer(layer);
+        try {
+            assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(null).size());
+            assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(0, 0)).size());
+            assertEquals(1, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(1.5, 1.5)).size());
+            assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(new EastNorth(3, 3)).size());
+        } finally {
+            // Ensure we clean the place before leaving, even if test fails.
+            Main.main.removeLayer(layer);
+        }
     }
 
@@ -92 +96 @@
     public void testGetSmallestSurroundingObject() {
         Layer layer = initDataSet();
-        assertNull(SelectByInternalPointAction.getSmallestSurroundingObject(null));
-        assertNotNull(SelectByInternalPointAction.getSmallestSurroundingObject(new EastNorth(1.5, 1.5)));
-        Main.main.removeLayer(layer);
+        try {
+            assertNull(SelectByInternalPointAction.getSmallestSurroundingObject(null));
+            assertNotNull(SelectByInternalPointAction.getSmallestSurroundingObject(new EastNorth(1.5, 1.5)));
+        } finally {
+            // Ensure we clean the place before leaving, even if test fails.
+            Main.main.removeLayer(layer);
+        }
     }
 
@@ -103 +111 @@
     public void testPerformSelection() {
         Layer layer = initDataSet();
-        DataSet ds = JosmAction.getCurrentDataSet();
+        try {
+            DataSet ds = JosmAction.getCurrentDataSet();
 
-        assertEquals(0, ds.getSelected().size());
-        SelectByInternalPointAction.performSelection(null, false, false);
-        assertEquals(0, ds.getSelected().size());
-        SelectByInternalPointAction.performSelection(new EastNorth(0, 0), false, false);
-        assertEquals(0, ds.getSelected().size());
-        SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), false, false);
-        assertEquals(1, ds.getSelected().size());
-        ds.clearSelection();
-        ds.addSelected(ds.getNodes());
-        assertEquals(4, ds.getSelected().size());
-        SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), true, false);
-        assertEquals(5, ds.getSelected().size());
-        SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), false, true);
-        assertEquals(4, ds.getSelected().size());
-
-        Main.main.removeLayer(layer);
+            assertEquals(0, ds.getSelected().size());
+            SelectByInternalPointAction.performSelection(null, false, false);
+            assertEquals(0, ds.getSelected().size());
+            SelectByInternalPointAction.performSelection(new EastNorth(0, 0), false, false);
+            assertEquals(0, ds.getSelected().size());
+            SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), false, false);
+            assertEquals(1, ds.getSelected().size());
+            ds.clearSelection();
+            ds.addSelected(ds.getNodes());
+            assertEquals(4, ds.getSelected().size());
+            SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), true, false);
+            assertEquals(5, ds.getSelected().size());
+            SelectByInternalPointAction.performSelection(new EastNorth(1.5, 1.5), false, true);
+            assertEquals(4, ds.getSelected().size());
+        } finally {
+            // Ensure we clean the place before leaving, even if test fails.
+            Main.main.removeLayer(layer);
+        }
     }
 }