Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2396)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2399)
@@ -247,5 +247,5 @@
         assertEquals(10, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
+            Node n2 = (Node)ds.getPrimitiveById(n1);
             assertNotNull(n2);
             assertEquals(n2.get("name"),n2.get("name"));
@@ -264,5 +264,5 @@
         assertEquals(10, out.getWays().size());
         for (Way w1: out.getWays()) {
-            Way w2 = (Way)ds.getPrimitiveById(w1.getId(), OsmPrimitiveType.WAY);
+            Way w2 = (Way)ds.getPrimitiveById(w1);
             assertNotNull(w2);
             assertEquals(w2.getNodesCount(), w1.getNodesCount());
@@ -300,5 +300,5 @@
         assertEquals(812, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
+            Node n2 = (Node)ds.getPrimitiveById(n1);
             assertNotNull(n2);
             assertEquals(n2.get("name"),n2.get("name"));
@@ -319,5 +319,5 @@
         assertEquals(10, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
+            Node n2 = (Node)ds.getPrimitiveById(n1);
             assertNotNull(n2);
             assertEquals(n2.get("name"),n2.get("name"));
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2396)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2399)
@@ -322,5 +322,5 @@
         Set<Long> expectedNodeIds = new HashSet<Long>();
         for (Way way : referers.getWays()) {
-            Way orig = (Way) ds.getPrimitiveById(way.getId(), OsmPrimitiveType.WAY);
+            Way orig = (Way) ds.getPrimitiveById(way);
             for (Node n : orig.getNodes()) {
                 expectedNodeIds.add(n.getId());