Changeset 11102 in josm for trunk/test/unit

Timestamp:

2016-10-08T14:04:09+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (2 diffs)
• gui/conflict/pair/ConflictResolverTest.java (added)
• gui/dialogs/CommandStackDialogTest.java (modified) (3 diffs)
• io/auth (added)
• io/auth/CredentialsAgentExceptionTest.java (added)
• tools/bugreport/DebugTextDisplayTest.java (added)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -10 +10 @@
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Comparator;
 
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -245 +248 @@
         return relation;
     }
+
+    /**
+     * Creates a new empty command.
+     * @return a new empty command
+     */
+    public static Command newCommand() {
+        return new Command() {
+            @Override
+            public String getDescriptionText() {
+                return "";
+            }
+
+            @Override
+            public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
+                    Collection<OsmPrimitive> added) {
+                // Do nothing
+            }
+        };
+    }
 }

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

@@ -7 +7 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -24 +29 @@
 
     /**
-     * Unit test of {@link CommandStackDialog} class.
+     * Unit test of {@link CommandStackDialog} class - empty case.
      */
     @Test
-    public void testCommandStackDialog() {
+    public void testCommandStackDialogEmpty() {
         CommandStackDialog dlg = new CommandStackDialog();
         dlg.showDialog();
@@ -34 +39 @@
         assertFalse(dlg.isVisible());
     }
+
+    /**
+     * Unit test of {@link CommandStackDialog} class - not empty case.
+     */
+    @Test
+    public void testCommandStackDialogNotEmpty() {
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+        Main.getLayerManager().addLayer(layer);
+        try {
+            Command cmd1 = TestUtils.newCommand();
+            Command cmd2 = TestUtils.newCommand();
+            Main.main.undoRedo.add(cmd1);
+            Main.main.undoRedo.add(cmd2);
+            Main.main.undoRedo.undo(1);
+
+            assertFalse(Main.main.undoRedo.commands.isEmpty());
+            assertFalse(Main.main.undoRedo.redoCommands.isEmpty());
+
+            CommandStackDialog dlg = new CommandStackDialog();
+            dlg.showDialog();
+            assertTrue(dlg.isVisible());
+            dlg.hideDialog();
+            assertFalse(dlg.isVisible());
+        } finally {
+            Main.main.undoRedo.clean();
+            Main.getLayerManager().removeLayer(layer);
+        }
+    }
 }