Changeset 224 in josm for test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

Timestamp:

2007-05-05T23:33:16+02:00 (17 years ago)

Author:

framm

Message:

Fixed MergeVisitor so that it will never merge between objects that are
part of the group of objects being added - only between pre-existing
objects and those being added.

File:

• test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (8 diffs)

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

@@ -25 +25 @@
                 ds = new DataSet();
                 dsNode = DataSetTestCaseHelper.createNode(ds);
-                v = new MergeVisitor(ds);
+                v = new MergeVisitor(ds, null);
                 n = DataSetTestCaseHelper.createNode(null);
         }
@@ -235 +235 @@
 
                 Segment ls2 = DataSetTestCaseHelper.createSegment(ds, n2[0], n2[1]);
-                v = new MergeVisitor(ds);
+                v = new MergeVisitor(ds, null);
                 for (OsmPrimitive osm : ds2.allPrimitives())
                         osm.visit(v);
@@ -249 +249 @@
                 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
                 Way w = DataSetTestCaseHelper.createWay(ds, s);
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(n[0]);
                 v.visit(n[1]);
@@ -281 +281 @@
                 w.id = 42;
                 // merge both
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(w);
                 v.fixReferences();
@@ -299 +299 @@
                 s.timestamp = new Date(new Date().getTime()+1);
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(s);
                 v.fixReferences();
@@ -308 +308 @@
         public void testMergeIncompleteSegmentsAddToDataSet() throws Exception {
                 DataSet ds = new DataSet();
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(createSegment(null, true, false, 1));
                 assertEquals(1, ds.segments.size());
@@ -330 +330 @@
                 newNode.timestamp = new Date(date.getTime());
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(newNode);
 
@@ -343 +343 @@
                 Segment s2 = new Segment(42);
                 
-                MergeVisitor v = new MergeVisitor(ds);
+                MergeVisitor v = new MergeVisitor(ds, null);
                 v.visit(s1);
                 v.visit(s2);