Changeset 12849 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2017-09-14T00:22:37+02:00 (9 years ago)

Author:

bastiK

Message:

see #15229 - use Config in tests

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• MergeNodesActionTest.java (modified) (3 diffs)
• mapmode/SelectActionTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/MergeNodesActionTest.java

@@ -10 +10 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -43 +43 @@
     @Test(expected = IllegalStateException.class)
     public void testSelectTargetLocationNodeInvalidMode() {
-        Main.pref.putInt("merge-nodes.mode", -1);
+        Config.getPref().putInt("merge-nodes.mode", -1);
         MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1)));
     }
@@ -52 +52 @@
     @Test
     public void testSelectTargetLocationNode() {
-        Main.pref.putInt("merge-nodes.mode", 0);
+        Config.getPref().putInt("merge-nodes.mode", 0);
         assertEquals(1, MergeNodesAction.selectTargetLocationNode(Arrays.asList(new Node(0), new Node(1))).getId());
 
-        Main.pref.putInt("merge-nodes.mode", 1);
+        Config.getPref().putInt("merge-nodes.mode", 1);
         assertEquals(LatLon.ZERO, MergeNodesAction.selectTargetLocationNode(
                 Arrays.asList(new Node(LatLon.NORTH_POLE), new Node(LatLon.SOUTH_POLE))).getCoor());
 
-        Main.pref.putInt("merge-nodes.mode", 2);
+        Config.getPref().putInt("merge-nodes.mode", 2);
         assertEquals(LatLon.NORTH_POLE, MergeNodesAction.selectTargetLocationNode(
                 Arrays.asList(new Node(LatLon.NORTH_POLE))).getCoor());

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

@@ -14 +14 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode;
@@ -26 +25 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Utils;
@@ -88 +88 @@
         dataSet.addSelected(w);
 
-        Main.pref.put("edit.initial-move-delay", "0");
+        Config.getPref().put("edit.initial-move-delay", "0");
         MainApplication.getLayerManager().addLayer(layer);
         try {