Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 1707)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 1750)
@@ -102,6 +102,6 @@
 
         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));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1707)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1750)
@@ -722,6 +722,6 @@
         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);
     }