Changeset 12641 in josm for trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java

Timestamp:

2017-08-25T03:01:22+02:00 (9 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.main.undoRedo. Replacement: gui.MainApplication.undoRedo

File:

• trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java (modified) (4 diffs)

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

@@ -12 +12 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.PseudoCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -20 +19 @@
 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
-        Main.main.undoRedo.commands.clear();
+        MainApplication.undoRedo.commands.clear();
         new FixDataHook().checkUpload(new APIDataSet());
-        assertTrue(Main.main.undoRedo.commands.isEmpty());
+        assertTrue(MainApplication.undoRedo.commands.isEmpty());
 
         // Complete data set
@@ -77 +77 @@
         ads.init(Arrays.asList(emptyNode, emptyWay, emptyRelation, w1, w2, w3, w4, w5, w6, w7, r1, r2));
 
-        Main.main.undoRedo.commands.clear();
+        MainApplication.undoRedo.commands.clear();
         new FixDataHook().checkUpload(ads);
-        assertEquals(1, Main.main.undoRedo.commands.size());
+        assertEquals(1, MainApplication.undoRedo.commands.size());
 
-        SequenceCommand seq = (SequenceCommand) Main.main.undoRedo.commands.iterator().next();
+        SequenceCommand seq = (SequenceCommand) MainApplication.undoRedo.commands.iterator().next();
         Collection<? extends OsmPrimitive> prims = seq.getParticipatingPrimitives();
         assertNotNull(prims);