Changeset 3283 in josm for trunk/test

Timestamp:

2010-05-29T09:06:16+02:00 (14 years ago)

Author:

jttt

Message:

Fix tests

Location:

trunk/test/unit/org/openstreetmap/josm/data/osm

Files:

• DataSetMergerTest.java (modified) (5 diffs)
• OsmPrimitiveTest.java (modified) (2 diffs)
• RelationTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -16 +16 @@
 import org.junit.Before;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Mercator;
 
 public class DataSetMergerTest {
@@ -67 +69 @@
         their = new DataSet();
         their.setVersion("0.6");
+        Main.proj = new Mercator();
     }
 
@@ -292 +295 @@
     /**
      * My and their node are new but semantically equal. My node is deleted.
-     * 
+     *
      * => Ignore my node, no conflict
      */
@@ -923 +926 @@
     /**
      * Merge an incomplete way with two incomplete nodes into an empty dataset.
-     * 
+     *
      * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456
      */
@@ -966 +969 @@
     /**
      * Merge an incomplete way with two incomplete nodes into a dataset where the way already exists as complete way.
-     * 
+     *
      * Use case: a way loaded with a multiget, i.e. GET /api/0.6/ways?ids=123456 after a "Update selection " of this way
      */

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -6 +6 @@
 
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Mercator;
 
 public class OsmPrimitiveTest {
@@ -17 +20 @@
 
     private DataSet dataSet = new DataSet();
+
+    @BeforeClass
+    public static void setUp() {
+        Main.proj = new Mercator();
+    }
 
     @Test

trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

@@ -5 +5 @@
 
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Mercator;
 
 public class RelationTest {
+
+    @BeforeClass
+    public static void setUp() {
+        Main.proj = new Mercator();
+    }
 
     @Test(expected=NullPointerException.class)