Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2014-05-09T04:49:54+02:00 (11 years ago)

Author:

Don-vip

Message:

fixes for unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• CreateMultipolygonActionTest.groovy (modified) (5 diffs)
• search/SearchCompilerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy

@@ -1 +1 @@
 package org.openstreetmap.josm.actions
 
-import org.openstreetmap.josm.Main
-import org.openstreetmap.josm.TestUtils;
+import org.junit.BeforeClass
+import org.junit.Test
+import org.openstreetmap.josm.JOSMFixture
+import org.openstreetmap.josm.TestUtils
 import org.openstreetmap.josm.actions.search.SearchCompiler
 import org.openstreetmap.josm.data.osm.Relation
 import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.data.projection.Projections
 import org.openstreetmap.josm.io.OsmReader
 import org.openstreetmap.josm.tools.Utils
 
-class CreateMultipolygonActionTest extends GroovyTestCase {
+class CreateMultipolygonActionTest {
 
-    @Override
-    void setUp() {
-        Main.initApplicationPreferences()
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
     }
 
@@ -26 +26 @@
     }
 
-    void testCreate1() {
+    @Test
+    public void testCreate1() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
         def mp = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), null)
@@ -33 +34 @@
     }
 
-    void testCreate2() {
+    @Test
+    public void testCreate2() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
         def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.", false, false))
@@ -40 +42 @@
     }
 
-    void testUpdate1() {
+    @Test
+    public void testUpdate1() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
         def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=\".*1\$\"", false, true))
@@ -52 +55 @@
     }
 
-    void testUpdate2() {
+    @Test
+    public void testUpdate2() {
         def ds = OsmReader.parseDataSet(new FileInputStream(TestUtils.getTestDataRoot() + "create_multipolygon.osm"), null);
         def ways = Utils.filter(ds.getWays(), SearchCompiler.compile("ref=1 OR ref:1.1.1", false, false))

trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java

@@ -4 +4 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -15 +15 @@
     @Before
     public void setUp() {
-        Main.initApplicationPreferences();
+        JOSMFixture.createUnitTestFixture().init();
     }