Changeset 14281 in josm for trunk/test

Timestamp:

2018-09-30T00:46:01+02:00 (6 years ago)

Author:

Don-vip

Message:

see #12726 - accessors for undo/redo commands

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/upload/FixDataHookTest.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialogTest.java (modified) (1 diff)

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

@@ -42 +42 @@
     public void testCheckUpload() {
         // Empty data set
-        UndoRedoHandler.getInstance().commands.clear();
+        UndoRedoHandler.getInstance().getUndoCommands().clear();
         new FixDataHook().checkUpload(new APIDataSet());
-        assertTrue(UndoRedoHandler.getInstance().commands.isEmpty());
+        assertTrue(UndoRedoHandler.getInstance().getUndoCommands().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));
 
-        UndoRedoHandler.getInstance().commands.clear();
+        UndoRedoHandler.getInstance().getUndoCommands().clear();
         new FixDataHook().checkUpload(ads);
-        assertEquals(1, UndoRedoHandler.getInstance().commands.size());
+        assertEquals(1, UndoRedoHandler.getInstance().getUndoCommands().size());
 
-        SequenceCommand seq = (SequenceCommand) UndoRedoHandler.getInstance().commands.iterator().next();
+        SequenceCommand seq = (SequenceCommand) UndoRedoHandler.getInstance().getUndoCommands().iterator().next();
         Collection<? extends OsmPrimitive> prims = seq.getParticipatingPrimitives();
         assertNotNull(prims);

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

@@ -57 +57 @@
             UndoRedoHandler.getInstance().undo(1);
 
-            assertFalse(UndoRedoHandler.getInstance().commands.isEmpty());
-            assertFalse(UndoRedoHandler.getInstance().redoCommands.isEmpty());
+            assertTrue(UndoRedoHandler.getInstance().hasUndoCommands());
+            assertTrue(UndoRedoHandler.getInstance().hasRedoCommands());
 
             MapFrame map = MainApplication.getMap();