Changeset 1951 in josm for trunk/test/functional/org/openstreetmap/josm/io

Timestamp:

2009-08-10T20:36:40+02:00 (16 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

Location:

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

Files:

• MultiFetchServerObjectReaderTest.java (modified) (3 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (2 diffs)

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

@@ -95 +95 @@
                 int idx = (start + j) % 500;
                 Node n = nodes.get(idx);
-                r.members.add(new RelationMember("role-" + j, n));
+                r.addMember(new RelationMember("role-" + j, n));
             }
             int numWaysInRelation = (int)Math.round(Math.random() * 10);
@@ -102 +102 @@
                 int idx = (start + j) % 500;
                 Way w = ways.get(idx);
-                r.members.add(new RelationMember("role-" + j, w));
+                r.addMember(new RelationMember("role-" + j, w));
             }
             ds.addPrimitive(r);
@@ -288 +288 @@
             Relation r2 = (Relation)ds.getPrimitiveById(r1.id);
             assertNotNull(r2);
-            assertEquals(r2.members.size(), r1.members.size());
+            assertEquals(r2.getMembersCount(), r1.getMembersCount());
             assertEquals(r2.get("name"),r2.get("name"));
         }

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

@@ -88 +88 @@
             for (int j =0; j < 10; j++) {
                 RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j));
-                r.members.add(member);
+                r.addMember(member);
             }
             for (int j =0; j < 5; j++) {
                 RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j));
-                r.members.add(member);
+                r.addMember(member);
             }
             if (i > 5) {
@@ -98 +98 @@
                     RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j));
                     logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i));
-                    r.members.add(member);
+                    r.addMember(member);
                 }
             }