Changeset 13021 in josm for trunk/test/unit

Timestamp:

2017-10-18T17:25:29+02:00 (7 years ago)

Author:

bastiK

Message:

make Preferences more generic (see #15229, closes #15451)

• extract base directories
• move updateSystemProperties() as it is specific to JOSM-core as a "prefefences client"

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (2 diffs)
• testutils/JOSMTestRules.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -98 +99 @@
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
         Config.setPreferencesInstance(Main.pref);
-        Config.setBaseDirectoriesProvider(Main.pref);
+        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Main.pref.resetToInitialState();
         Main.pref.enableSaveOnPut(false);

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -31 +32 @@
 import org.openstreetmap.josm.io.OsmConnection;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -40 +42 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -278 +279 @@
 
         Config.setPreferencesInstance(Main.pref);
-        Config.setBaseDirectoriesProvider(Main.pref);
+        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         // All tests use the same timezone.
         TimeZone.setDefault(DateUtils.UTC);