Changeset 1750 in josm for trunk/test/unit

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

Location:

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

Files:

• history/HistoryWayTest.java (modified) (1 diff)
• visitor/MergeVisitorTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java

@@ -102 +102 @@
 
         assertEquals(2, ids.size());
-        assertEquals(1, ids.get(0));
-        assertEquals(2, ids.get(1));
+        assertEquals(1, (long) ids.get(0));
+        assertEquals(2, (long) ids.get(1));
     }
 

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

@@ -722 +722 @@
         Way merged = (Way)my.getPrimitiveById(3);
         assertEquals(1,visitor.getConflicts().size());
-        assertEquals(true, visitor.getConflicts().keySet().contains(myWay));
-        assertEquals(true, visitor.getConflicts().values().contains(theirWay));
+        assertEquals(true, visitor.getConflicts().hasConflictForMy(myWay));
+        assertEquals(true, visitor.getConflicts().hasConflictForTheir(theirWay));
         assertEquals(myWay,merged);
     }