Changeset 7081 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/visitor

Timestamp:

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

Author:

Don-vip

Message:

fixes for unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (12 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -11 +11 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.projection.Projections;
 
 public class MergeSourceBuildingVisitorTest {
@@ -39 +38 @@
     @BeforeClass
     public static void setUp() {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
-        Main.initApplicationPreferences();
-    }
-
-    @Test
-    public void test_Nodes() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    @Test
+    public void testNodes() {
         DataSet source = new DataSet();
         Node n1 = new Node(1);
@@ -79 +77 @@
 
     @Test
-    public void test_OneWay() {
+    public void testOneWay() {
         DataSet source = new DataSet();
         Node n1 = new Node(1);
@@ -111 +109 @@
 
     @Test
-    public void test_OneWay_NodesSelectedToo() {
+    public void testOneWayNodesSelectedToo() {
         DataSet source = new DataSet();
         Node n1 = new Node(1);
@@ -143 +141 @@
 
     @Test
-    public void test_OneWay_Incomplete() {
+    public void testOneWayIncomplete() {
         DataSet source = new DataSet();
         Way w1 = new Way(3);
@@ -161 +159 @@
 
     @Test
-    public void test_OneRelation_ExistingMembersSelected() {
+    public void testOneRelationExistingMembersSelected() {
         DataSet source = new DataSet();
         Relation r1 = new Relation(1, 1);
@@ -220 +218 @@
 
     @Test
-    public void test_OneRelation_ExistingMembersNotSelected() {
+    public void testOneRelationExistingMembersNotSelected() {
         DataSet source = new DataSet();
         Relation r1 = new Relation(1, 1);
@@ -279 +277 @@
 
     @Test
-    public void test_OneRelation_NewMembersNotSelected() {
+    public void testOneRelationNewMembersNotSelected() {
         DataSet source = new DataSet();
         Relation r1 = new Relation();
@@ -346 +344 @@
 
     @Test
-    public void test_OneRelation_Existing_Recursive() {
+    public void testOneRelationExistingRecursive() {
         DataSet source = new DataSet();
         Relation r1 = new Relation(1, 1);
@@ -365 +363 @@
 
     @Test
-    public void test_OneRelation_New_Recursive() {
+    public void testOneRelationNewRecursive() {
         DataSet source = new DataSet();
         Relation r1 = new Relation();
@@ -385 +383 @@
 
     @Test
-    public void test_TwoRelation_Existing_Circular() {
+    public void testTwoRelationExistingCircular() {
         DataSet source = new DataSet();
         Relation r1 = new Relation(1, 1);