Changeset 1928 in josm for trunk/test

Timestamp:

2009-08-08T11:32:27+02:00 (15 years ago)

Author:

jttt

Message:

Make parameterless RelationMember constructor deprecated

Location:

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

Files:

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

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

@@ -95 +95 @@
                 int idx = (start + j) % 500;
                 Node n = nodes.get(idx);
-                RelationMember member = new RelationMember();
-                member.member = n;
-                member.role = "role-" + j;
-                r.members.add(member);
+                r.members.add(new RelationMember("role-" + j, n));
             }
             int numWaysInRelation = (int)Math.round(Math.random() * 10);
@@ -105 +102 @@
                 int idx = (start + j) % 500;
                 Way w = ways.get(idx);
-                RelationMember member = new RelationMember();
-                member.member = w;
-                member.role = "role-" + j;
-                r.members.add(member);
+                r.members.add(new RelationMember("role-" + j, w));
             }
             ds.addPrimitive(r);

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

@@ -87 +87 @@
             r.put("name", "relation-" +i);
             for (int j =0; j < 10; j++) {
-                RelationMember member = new RelationMember();
-                member.role = "node-" + j;
-                member.member = lookupNode(ds, i + j);
+                RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j));
+                r.members.add(member);
             }
             for (int j =0; j < 5; j++) {
-                RelationMember member = new RelationMember();
-                member.role = "way-" + j;
-                member.member = lookupWay(ds, i + j);
+                RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j));
                 r.members.add(member);
             }
             if (i > 5) {
                 for (int j =0; j < 3; j++) {
-                    RelationMember member = new RelationMember();
-                    member.role = "relation-" + j;
-                    member.member = lookupRelation(ds, j);
+                    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);