Changeset 12848 in josm

Timestamp:

2017-09-14T00:09:59+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - set up Config for tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

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

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

@@ -23 +23 @@
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.I18n;
@@ -96 +97 @@
         System.setProperty("josm.home", josmHome);
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        Config.setPreferencesInstance(Main.pref);
         Main.pref.resetToInitialState();
         Main.pref.enableSaveOnPut(false);

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

@@ -40 +40 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -276 +277 @@
         cleanUpFromJosmFixture();
 
+        Config.setPreferencesInstance(Main.pref);
         // All tests use the same timezone.
         TimeZone.setDefault(DateUtils.UTC);