Changeset 11110 in josm for trunk/test/unit/org

Timestamp:

2016-10-09T13:47:44+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/MergeNodesActionTest.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialogTest.java (modified) (1 diff)
• gui/io/DownloadOpenChangesetsTaskTest.java (added)
• testutils/JOSMTestRules.java (modified) (1 diff)

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

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -69 +70 @@
     public void testSelectTargetNode() {
         assertNull(MergeNodesAction.selectTargetNode(Collections.emptyList()));
-        assertEquals(1, MergeNodesAction.selectTargetNode(Arrays.asList(new Node(1))).getId());
+        DataSet ds = new DataSet();
+        Node n1 = new Node(1);
+        ds.addPrimitive(n1);
+        assertEquals(1, MergeNodesAction.selectTargetNode(Arrays.asList(n1)).getId());
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java

@@ -58 +58 @@
 
             CommandStackDialog dlg = new CommandStackDialog();
-            dlg.showDialog();
+            Main.map.addToggleDialog(dlg);
+            dlg.unfurlDialog();
             assertTrue(dlg.isVisible());
+            Main.map.removeToggleDialog(dlg);
             dlg.hideDialog();
             assertFalse(dlg.isVisible());

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

@@ -269 +269 @@
 
         // TODO: Remove global listeners and other global state.
-        Main.pref.resetToInitialState();;
+        Main.pref.resetToInitialState();
         Main.platform = null;
         // Parts of JOSM uses weak references - destroy them.