Changeset 1951 in josm for trunk/test/functional


Ignore:
Timestamp:
2009-08-10T20:36:40+02:00 (10 years ago)
Author:
jttt
Message:

Replace some occurrences of RelationMember.member with getters

Location:
trunk/test/functional/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java

    r1707 r1951  
    1010import org.openstreetmap.josm.data.osm.RelationMember;
    1111import org.openstreetmap.josm.data.osm.Way;
    12 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMerger;
    13 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMergerTest;
    1412
    1513public class RelationMemberMergerTest extends JFrame {
    16    
     14
    1715    private RelationMemberMerger merger;
    18    
     16
    1917    protected void populate() {
    2018        Relation r1 = new Relation();
    21         r1.members.add(new RelationMember("role1", new Node(1)));
    22         r1.members.add(new RelationMember("role2", new Way(2)));
    23         r1.members.add(new RelationMember("role3", new Relation(3)));
     19        r1.addMember(new RelationMember("role1", new Node(1)));
     20        r1.addMember(new RelationMember("role2", new Way(2)));
     21        r1.addMember(new RelationMember("role3", new Relation(3)));
    2422
    25        
     23
    2624        Relation r2 = new Relation();
    27         r2.members.add(new RelationMember("role1", new Node(1)));
    28         r2.members.add(new RelationMember("role2", new Way(2)));
    29         r2.members.add(new RelationMember("role3", new Relation(3)));
    30        
     25        r2.addMember(new RelationMember("role1", new Node(1)));
     26        r2.addMember(new RelationMember("role2", new Way(2)));
     27        r2.addMember(new RelationMember("role3", new Relation(3)));
     28
    3129        merger.populate(r1, r2);
    3230
    3331    }
    34    
     32
    3533    protected void build() {
    3634        merger = new RelationMemberMerger();
     
    3836        getContentPane().add(merger, BorderLayout.CENTER);
    3937    }
    40    
     38
    4139    public RelationMemberMergerTest() {
    4240        build();
    4341        populate();
    4442    }
    45    
     43
    4644    static public void main(String args[]) {
    4745        RelationMemberMergerTest test = new RelationMemberMergerTest();
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r1928 r1951  
    9595                int idx = (start + j) % 500;
    9696                Node n = nodes.get(idx);
    97                 r.members.add(new RelationMember("role-" + j, n));
     97                r.addMember(new RelationMember("role-" + j, n));
    9898            }
    9999            int numWaysInRelation = (int)Math.round(Math.random() * 10);
     
    102102                int idx = (start + j) % 500;
    103103                Way w = ways.get(idx);
    104                 r.members.add(new RelationMember("role-" + j, w));
     104                r.addMember(new RelationMember("role-" + j, w));
    105105            }
    106106            ds.addPrimitive(r);
     
    288288            Relation r2 = (Relation)ds.getPrimitiveById(r1.id);
    289289            assertNotNull(r2);
    290             assertEquals(r2.members.size(), r1.members.size());
     290            assertEquals(r2.getMembersCount(), r1.getMembersCount());
    291291            assertEquals(r2.get("name"),r2.get("name"));
    292292        }
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r1938 r1951  
    8888            for (int j =0; j < 10; j++) {
    8989                RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j));
    90                 r.members.add(member);
     90                r.addMember(member);
    9191            }
    9292            for (int j =0; j < 5; j++) {
    9393                RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j));
    94                 r.members.add(member);
     94                r.addMember(member);
    9595            }
    9696            if (i > 5) {
     
    9898                    RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j));
    9999                    logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i));
    100                     r.members.add(member);
     100                    r.addMember(member);
    101101                }
    102102            }
Note: See TracChangeset for help on using the changeset viewer.