Changeset 14134 in josm for trunk/test/unit

Timestamp:

2018-08-11T23:33:58+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main*.undoRedo - make UndoRedoHandler a singleton

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/mapmode/DrawActionTest.java (modified) (2 diffs)
• actions/upload/FixDataHookTest.java (modified) (3 diffs)
• command/SplitWayCommandTest.java (modified) (3 diffs)
• gui/dialogs/CommandStackDialogTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

@@ -16 +16 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -91 +92 @@
             assertNotNull(renderer.getListCellRendererComponent(lstPrimitives, n3, 0, false, false));
 
-            MainApplication.undoRedo.undo();
+            UndoRedoHandler.getInstance().undo();
 
             assertEquals(2, w.getNodesCount());

trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java

@@ -15 +15 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -42 +42 @@
     public void testCheckUpload() {
         // Empty data set
-        MainApplication.undoRedo.commands.clear();
+        UndoRedoHandler.getInstance().commands.clear();
         new FixDataHook().checkUpload(new APIDataSet());
-        assertTrue(MainApplication.undoRedo.commands.isEmpty());
+        assertTrue(UndoRedoHandler.getInstance().commands.isEmpty());
 
         // Complete data set (except empty node which cannot be tested anymore)
@@ -76 +76 @@
         ads.init(new DataSet(emptyWay, emptyRelation, w1, w2, w3, w4, w5, w6, w7, r1, r2));
 
-        MainApplication.undoRedo.commands.clear();
+        UndoRedoHandler.getInstance().commands.clear();
         new FixDataHook().checkUpload(ads);
-        assertEquals(1, MainApplication.undoRedo.commands.size());
+        assertEquals(1, UndoRedoHandler.getInstance().commands.size());
 
-        SequenceCommand seq = (SequenceCommand) MainApplication.undoRedo.commands.iterator().next();
+        SequenceCommand seq = (SequenceCommand) UndoRedoHandler.getInstance().commands.iterator().next();
         Collection<? extends OsmPrimitive> prims = seq.getParticipatingPrimitives();
         assertNotNull(prims);

trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java

@@ -13 +13 @@
 import org.junit.Test;
 import org.openstreetmap.josm.command.SplitWayCommand.Strategy;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -20 +21 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -121 +121 @@
         final SplitWayCommand result = SplitWayCommand.splitWay(
                 w2, SplitWayCommand.buildSplitChunks(w2, Arrays.asList(n3, n4, n5)), new ArrayList<OsmPrimitive>(), strategy);
-        MainApplication.undoRedo.add(result);
+        UndoRedoHandler.getInstance().add(result);
 
         assertEquals(6, route.getMembersCount());

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

@@ -9 +9 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -52 +53 @@
             Command cmd1 = TestUtils.newCommand(ds);
             Command cmd2 = TestUtils.newCommand(ds);
-            MainApplication.undoRedo.add(cmd1);
-            MainApplication.undoRedo.add(cmd2);
-            MainApplication.undoRedo.undo(1);
+            UndoRedoHandler.getInstance().add(cmd1);
+            UndoRedoHandler.getInstance().add(cmd2);
+            UndoRedoHandler.getInstance().undo(1);
 
-            assertFalse(MainApplication.undoRedo.commands.isEmpty());
-            assertFalse(MainApplication.undoRedo.redoCommands.isEmpty());
+            assertFalse(UndoRedoHandler.getInstance().commands.isEmpty());
+            assertFalse(UndoRedoHandler.getInstance().redoCommands.isEmpty());
 
             MapFrame map = MainApplication.getMap();
@@ -68 +69 @@
             assertFalse(dlg.isVisible());
         } finally {
-            MainApplication.undoRedo.clean();
+            UndoRedoHandler.getInstance().clean();
             MainApplication.getLayerManager().removeLayer(layer);
         }