Changeset 6603 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-03T04:51:04+01:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• MapCSSTagCheckerTest.java (modified) (3 diffs)
• UnconnectedWaysTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.openstreetmap.TestUtils;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.validation.Severity;
-import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.Predicates;
-import org.openstreetmap.josm.tools.Utils;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.StringReader;
@@ -22 +13 @@
 import java.util.Map;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.TestUtils;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 public class MapCSSTagCheckerTest {
@@ -32 +30 @@
     @Before
     public void setUp() throws Exception {
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
     }
 

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
+
+import static org.CustomMatchers.isEmpty;
+import static org.junit.Assert.assertThat;
+
+import java.io.FileInputStream;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmReader;
-
-import java.io.FileInputStream;
-
-import static org.CustomMatchers.isEmpty;
-import static org.junit.Assert.assertThat;
 
 public class UnconnectedWaysTest {
@@ -23 +22 @@
     public void setUp() throws Exception {
         bib = new UnconnectedWays.UnconnectedHighways();
-        Main.pref = new Preferences();
+        Main.initApplicationPreferences();
         Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         bib.initialize();