Changeset 6471 in josm for trunk/test/unit/org/openstreetmap/josm/tools

Timestamp:

2013-12-11T00:51:08+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar - remove warnings related to the static preferences initialization in instance methods

Location:

trunk/test/unit/org/openstreetmap/josm/tools

Files:

• TextTagParserTest.java (modified) (1 diff)
• UtilsTest.java (modified) (2 diffs)
• template_engine/TemplateEngineTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java

@@ -15 +15 @@
     @BeforeClass
     public static void before() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -74 +74 @@
     @Test
     public void testOpenUrlGzip() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/1613906/data"), true);
         Assert.assertTrue(x.readLine().startsWith("<?xml version="));
@@ -82 +82 @@
     @Test
     public void testOpenUrlBzip() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/785544/data"), true);
         Assert.assertTrue(x.readLine().startsWith("<?xml version="));

trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
-
 
 import java.util.Arrays;
@@ -12 +11 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DatasetFactory;
 import org.openstreetmap.josm.data.osm.Node;
@@ -23 +21 @@
     @BeforeClass
     public static void before() {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }