Changeset 285 in josm for test/unit

Timestamp:

2007-07-11T21:41:12+02:00 (17 years ago)

Author:

imi

Message:

• fixed test dependencies
• added more functional tests

Location:

test/unit/org/openstreetmap/josm

Files:

• data/osm/visitor/MergeVisitorTest.java (modified) (1 diff)
• testframework/MotherObject.java (modified) (1 diff)

test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -350 +350 @@
                 assertEquals(23, ds.segments.iterator().next().id);
         }
-        
-        public void testDoNotMergeEqualObjectsWithDifferentNonZeroId() throws Exception {
-                DataSet ds = new DataSet();
-                Segment s1 = createSegment(ds, false, false, 23);
-                Segment s2 = new Segment(s1);
-                s2.id = 42;
-                MergeVisitor v = new MergeVisitor(ds, null);
-                v.visit(s2);
-                assertEquals(2, ds.segments.size());
-        }
 }

test/unit/org/openstreetmap/josm/testframework/MotherObject.java

@@ -23 +23 @@
             super.setUp();
             Main.proj = new Epsg4326();
+            Main.ds = new DataSet();
     }