Index: trunk/test/config/unit-josm.home/preferences
===================================================================
--- trunk/test/config/unit-josm.home/preferences	(revision 1750)
+++ trunk/test/config/unit-josm.home/preferences	(revision 1750)
@@ -0,0 +1,57 @@
+agpifoj.visible=true
+cache.motd.html=1243869814
+color.background=#FFFFFF
+color.gps marker=#660066
+color.gps point=#660066
+commandstack.visible=true
+conflict.resolution=extended
+conflict.visible=true
+conflictresolutiondialog.height=824
+conflictresolutiondialog.width=1193
+conflictresolutiondialog.x=149
+conflictresolutiondialog.y=88
+coordinates=DECIMAL_DEGREES
+download.gps=false
+download.osm=true
+download.tab=2
+draw.rawgps.direction=true
+history.visible=true
+josm.version=1627 SVN
+laf=com.sun.java.swing.plaf.windows.WindowsLookAndFeel
+language=en
+layerlist.visible=true
+marker.audiofromstart=false
+marker.buttonlabels=false
+marker.show test.osm=hide
+osm-server.url=http://api06.dev.openstreetmap.org/api
+projection=org.openstreetmap.josm.data.projection.Epsg4326
+propertiesdialog.visible=true
+proxy.anonymous=false
+proxy.enable=false
+relationlist.visible=true
+save.keepbackup=false
+selectionlist.visible=true
+shortcut.groups.1=128
+shortcut.groups.10=64
+shortcut.groups.11=576
+shortcut.groups.12=64
+shortcut.groups.13=512
+shortcut.groups.15=640
+shortcut.groups.16=640
+shortcut.groups.17=576
+shortcut.groups.18=512
+shortcut.groups.19=128
+shortcut.groups.2=128
+shortcut.groups.20=512
+shortcut.groups.3=0
+shortcut.groups.4=512
+shortcut.groups.5=0
+shortcut.groups.6=512
+shortcut.groups.8=192
+shortcut.groups.9=192
+shortcut.groups.configured=true
+slippy_map_chooser.max_tiles=200
+upload.comment.history=automatic test upload§§§test§§§rcn84 - some fixes§§§testing JOSM ticket #2545 §§§bug hunting - please ignore§§§test uploadsdf§§§test upload§§§test swissgrid
+validator.tests=OverlappingWays=true,UnconnectedWays=true,SelfIntersectingWay=true,Coastlines=true,UnclosedWays=true,UntaggedWay=true,DuplicatedWayNodes=true,CrossingWays=true,SimilarNamedWays=true,WronglyOrderedWays=true,TagChecker=true,NodesWithSameName=true,DuplicateNode=true,UntaggedNode=true
+validator.testsBeforeUpload=OverlappingWays=true,UnconnectedWays=true,SelfIntersectingWay=true,Coastlines=true,UnclosedWays=true,UntaggedWay=true,DuplicatedWayNodes=true,CrossingWays=true,SimilarNamedWays=true,WronglyOrderedWays=true,TagChecker=true,NodesWithSameName=true,DuplicateNode=true,UntaggedNode=true
+validator.visible=true
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 1709)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 1750)
@@ -57,5 +57,5 @@
         for (int i=0; i< numNodes; i++) {
             Node n = new Node(0);
-            n.coor = new LatLon(-36.6,47.6); // somewhere in the atlantic
+            n.setCoor(new LatLon(-36.6,47.6));
             n.put("name", "node-"+i);
             n.incomplete = false;
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 1709)
+++ 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 1709)
+++ 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);
     }