Changeset 14122 in josm for trunk/test/unit

Timestamp:

2018-08-11T18:18:58+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - minor preferences refactoring

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (6 diffs)

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

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.ImagePatternMatching;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -225 +226 @@
     @Test
     public void testSourcePrefObeyed() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
 
         this.setUpMiniMap();
@@ -252 +253 @@
     @Test
     public void testSourcePrefInvalid() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
 
         this.setUpMiniMap();
@@ -277 +278 @@
         MainApplication.getLayerManager().addLayer(new TestLayer());
 
-        Main.pref.put("slippy_map_chooser.mapstyle", "White Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "White Tiles");
         // ensure projection matches JMapViewer's
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
@@ -415 +416 @@
     @Test
     public void testShowDownloadedArea() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
-        Main.pref.putBoolean("slippy_map_chooser.show_downloaded_area", false);
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", false);
 
         DataSet dataSet = new DataSet();
@@ -574 +575 @@
     @Test
     public void testShowDownloadedAreaLayerSwitching() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
-        Main.pref.putBoolean("slippy_map_chooser.show_downloaded_area", true);
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", true);
 
         DataSet dataSetA = new DataSet();