Changeset 14149 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2018-08-12T17:24:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• dialogs/MinimapDialogTest.java (modified) (3 diffs)
• preferences/advanced/ExportProfileActionTest.java (modified) (2 diffs)
• preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (2 diffs)

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

@@ -26 +26 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -217 +216 @@
         assertEquals(0xff00ff00, paintedSlippyMap.getRGB(0, 0));
 
-        assertEquals("Green Tiles", Main.pref.get("slippy_map_chooser.mapstyle", "Fail"));
+        assertEquals("Green Tiles", Config.getPref().get("slippy_map_chooser.mapstyle", "Fail"));
     }
 
@@ -244 +243 @@
         this.assertSingleSelectedSourceLabel("Magenta Tiles");
 
-        assertEquals("Magenta Tiles", Main.pref.get("slippy_map_chooser.mapstyle", "Fail"));
+        assertEquals("Magenta Tiles", Config.getPref().get("slippy_map_chooser.mapstyle", "Fail"));
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java

@@ -6 +6 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
@@ -35 +35 @@
             "All the preferences of this group are default, nothing to save", JOptionPane.OK_OPTION
         ));
-        new ExportProfileAction(Main.pref, "foo", "bar").actionPerformed(null);
-        new ExportProfileAction(Main.pref, "expert", "expert").actionPerformed(null);
+        new ExportProfileAction(Preferences.main(), "foo", "bar").actionPerformed(null);
+        new ExportProfileAction(Preferences.main(), "expert", "expert").actionPerformed(null);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -97 +98 @@
         this.referenceBazJarOld = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v6.jar");
         this.referenceBazJarNew = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v7.jar");
-        this.pluginDir = Main.pref.getPluginsDirectory();
+        this.pluginDir = Preferences.main().getPluginsDirectory();
         this.targetDummyJar = new File(this.pluginDir, "dummy_plugin.jar");
         this.targetDummyJarNew = new File(this.pluginDir, "dummy_plugin.jar.new");