Changeset 3053 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

Timestamp:

27.02.2010 15:46:00 (2 years ago)

Author:

jttt

Message:

Fix tests

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (2 diffs)

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

@@ -292 +292 @@
     /**
      * My and their node are new but semantically equal. My node is deleted.
-     *
-     * => create a conflict
-     *
+     * 
+     * => Ignore my node, no conflict
      */
     @Test
@@ -309 +308 @@
         visitor.merge();
 
-        assertEquals(1,visitor.getConflicts().size());
+        assertEquals(0, visitor.getConflicts().size());
         assertTrue(n.getDataSet() == my);
         assertTrue(n1.getDataSet() == their);