Changeset 2399 in josm for trunk/test/functional

Timestamp:

2009-11-07T14:41:34+01:00 (14 years ago)

Author:

jttt

Message:

Added map of primitives to dataset to make search by id faster
check if primitive already exist in addPrimitive and removePrimitive
use PrimitiveId instead of id + primitive type

Location:

trunk/test/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (4 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -247 +247 @@
         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 +264 @@
         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 +300 @@
         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 +319 @@
         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"));

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -322 +322 @@
         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());