Changeset 12849 in josm for trunk/test/unit/org/openstreetmap/josm/actions
- Timestamp:
- 2017-09-14T00:22:37+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/actions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java
r12842 r12849 10 10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.Main;13 12 import org.openstreetmap.josm.data.coor.LatLon; 14 13 import org.openstreetmap.josm.data.osm.DataSet; 15 14 import org.openstreetmap.josm.data.osm.Node; 15 import org.openstreetmap.josm.spi.preferences.Config; 16 16 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 17 … … 43 43 @Test(expected = IllegalStateException.class) 44 44 public void testSelectTargetLocationNodeInvalidMode() { 45 Main.pref.putInt("merge-nodes.mode", -1);45 Config.getPref().putInt("merge-nodes.mode", -1); 46 46 MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1))); 47 47 } … … 52 52 @Test 53 53 public void testSelectTargetLocationNode() { 54 Main.pref.putInt("merge-nodes.mode", 0);54 Config.getPref().putInt("merge-nodes.mode", 0); 55 55 assertEquals(1, MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1))).getId()); 56 56 57 Main.pref.putInt("merge-nodes.mode", 1);57 Config.getPref().putInt("merge-nodes.mode", 1); 58 58 assertEquals(LatLon.ZERO, MergeNodesAction.selectTargetLocationNode( 59 59 Arrays.asList(new Node(LatLon.NORTH_POLE), new Node(LatLon.SOUTH_POLE))).getCoor()); 60 60 61 Main.pref.putInt("merge-nodes.mode", 2);61 Config.getPref().putInt("merge-nodes.mode", 2); 62 62 assertEquals(LatLon.NORTH_POLE, MergeNodesAction.selectTargetLocationNode( 63 63 Arrays.asList(new Node(LatLon.NORTH_POLE))).getCoor()); -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
r12636 r12849 14 14 import org.junit.Rule; 15 15 import org.junit.Test; 16 import org.openstreetmap.josm.Main;17 16 import org.openstreetmap.josm.TestUtils; 18 17 import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode; … … 26 25 import org.openstreetmap.josm.gui.layer.MainLayerManager; 27 26 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 27 import org.openstreetmap.josm.spi.preferences.Config; 28 28 import org.openstreetmap.josm.testutils.JOSMTestRules; 29 29 import org.openstreetmap.josm.tools.Utils; … … 88 88 dataSet.addSelected(w); 89 89 90 Main.pref.put("edit.initial-move-delay", "0");90 Config.getPref().put("edit.initial-move-delay", "0"); 91 91 MainApplication.getLayerManager().addLayer(layer); 92 92 try {
Note:
See TracChangeset
for help on using the changeset viewer.