Changeset 12641 in josm for trunk/test/unit
- Timestamp:
- 2017-08-25T03:01:22+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
r12636 r12641 199 199 final SplitWayAction.SplitWayResult result = SplitWayAction.splitWay( 200 200 layer, w2, SplitWayAction.buildSplitChunks(w2, Arrays.asList(n3, n4, n5)), new ArrayList<OsmPrimitive>(), strategy); 201 Main .main.undoRedo.add(result.getCommand());201 MainApplication.undoRedo.add(result.getCommand()); 202 202 203 203 assertEquals(6, route.getMembersCount()); -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
r12636 r12641 17 17 import org.junit.Rule; 18 18 import org.junit.Test; 19 import org.openstreetmap.josm.Main;20 19 import org.openstreetmap.josm.data.coor.EastNorth; 21 20 import org.openstreetmap.josm.data.osm.DataSet; … … 93 92 assertNotNull(renderer.getListCellRendererComponent(lstPrimitives, n3, 0, false, false)); 94 93 95 Main .main.undoRedo.undo();94 MainApplication.undoRedo.undo(); 96 95 97 96 assertEquals(2, w.getNodesCount()); -
trunk/test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java
r12563 r12641 12 12 import org.junit.Rule; 13 13 import org.junit.Test; 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.command.PseudoCommand; 16 15 import org.openstreetmap.josm.command.SequenceCommand; … … 20 19 import org.openstreetmap.josm.data.osm.Relation; 21 20 import org.openstreetmap.josm.data.osm.Way; 21 import org.openstreetmap.josm.gui.MainApplication; 22 22 import org.openstreetmap.josm.testutils.JOSMTestRules; 23 23 … … 42 42 public void testCheckUpload() { 43 43 // Empty data set 44 Main .main.undoRedo.commands.clear();44 MainApplication.undoRedo.commands.clear(); 45 45 new FixDataHook().checkUpload(new APIDataSet()); 46 assertTrue(Main .main.undoRedo.commands.isEmpty());46 assertTrue(MainApplication.undoRedo.commands.isEmpty()); 47 47 48 48 // Complete data set … … 77 77 ads.init(Arrays.asList(emptyNode, emptyWay, emptyRelation, w1, w2, w3, w4, w5, w6, w7, r1, r2)); 78 78 79 Main .main.undoRedo.commands.clear();79 MainApplication.undoRedo.commands.clear(); 80 80 new FixDataHook().checkUpload(ads); 81 assertEquals(1, Main .main.undoRedo.commands.size());81 assertEquals(1, MainApplication.undoRedo.commands.size()); 82 82 83 SequenceCommand seq = (SequenceCommand) Main .main.undoRedo.commands.iterator().next();83 SequenceCommand seq = (SequenceCommand) MainApplication.undoRedo.commands.iterator().next(); 84 84 Collection<? extends OsmPrimitive> prims = seq.getParticipatingPrimitives(); 85 85 assertNotNull(prims); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java
r12636 r12641 7 7 import org.junit.Rule; 8 8 import org.junit.Test; 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.TestUtils; 11 10 import org.openstreetmap.josm.command.Command; … … 52 51 Command cmd1 = TestUtils.newCommand(); 53 52 Command cmd2 = TestUtils.newCommand(); 54 Main .main.undoRedo.add(cmd1);55 Main .main.undoRedo.add(cmd2);56 Main .main.undoRedo.undo(1);53 MainApplication.undoRedo.add(cmd1); 54 MainApplication.undoRedo.add(cmd2); 55 MainApplication.undoRedo.undo(1); 57 56 58 assertFalse(Main .main.undoRedo.commands.isEmpty());59 assertFalse(Main .main.undoRedo.redoCommands.isEmpty());57 assertFalse(MainApplication.undoRedo.commands.isEmpty()); 58 assertFalse(MainApplication.undoRedo.redoCommands.isEmpty()); 60 59 61 60 MapFrame map = MainApplication.getMap(); … … 68 67 assertFalse(dlg.isVisible()); 69 68 } finally { 70 Main .main.undoRedo.clean();69 MainApplication.undoRedo.clean(); 71 70 MainApplication.getLayerManager().removeLayer(layer); 72 71 }
Note:
See TracChangeset
for help on using the changeset viewer.