Changeset 1925 in josm for trunk/test/functional


Ignore:
Timestamp:
2009-08-08T08:52:03+02:00 (11 years ago)
Author:
jttt
Message:

Replaced Relation.members with Relation.getMembers()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r1910 r1925  
    381381        //
    382382        Set<Long> expectedWayIds = new HashSet<Long>();
    383         for (RelationMember m : lookupRelation(ds, 6).members) {
    384             if (m.member instanceof Way) {
    385                 expectedWayIds.add(m.member.id);
    386             }
    387         }
    388         for (RelationMember m : lookupRelation(ds, 7).members) {
    389             if (m.member instanceof Way) {
    390                 expectedWayIds.add(m.member.id);
    391             }
    392         }
    393         for (RelationMember m : lookupRelation(ds, 8).members) {
    394             if (m.member instanceof Way) {
    395                 expectedWayIds.add(m.member.id);
    396             }
    397         }
    398         for (RelationMember m : lookupRelation(ds, 9).members) {
     383        for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
     384            if (m.member instanceof Way) {
     385                expectedWayIds.add(m.member.id);
     386            }
     387        }
     388        for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
     389            if (m.member instanceof Way) {
     390                expectedWayIds.add(m.member.id);
     391            }
     392        }
     393        for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
     394            if (m.member instanceof Way) {
     395                expectedWayIds.add(m.member.id);
     396            }
     397        }
     398        for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
    399399            if (m.member instanceof Way) {
    400400                expectedWayIds.add(m.member.id);
     
    425425        HashSet<Long> ret = new HashSet<Long>();
    426426        if (r == null) return ret;
    427         for (RelationMember m: r.members) {
     427        for (RelationMember m: r.getMembers()) {
    428428            if (m.member instanceof Node) {
    429429                ret.add(m.member.id);
     
    477477        //
    478478        Set<Long> expectedWayIds = new HashSet<Long>();
    479         for (RelationMember m : lookupRelation(ds, 6).members) {
    480             if (m.member instanceof Way) {
    481                 expectedWayIds.add(m.member.id);
    482             }
    483         }
    484         for (RelationMember m : lookupRelation(ds, 7).members) {
    485             if (m.member instanceof Way) {
    486                 expectedWayIds.add(m.member.id);
    487             }
    488         }
    489         for (RelationMember m : lookupRelation(ds, 8).members) {
    490             if (m.member instanceof Way) {
    491                 expectedWayIds.add(m.member.id);
    492             }
    493         }
    494         for (RelationMember m : lookupRelation(ds, 9).members) {
     479        for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
     480            if (m.member instanceof Way) {
     481                expectedWayIds.add(m.member.id);
     482            }
     483        }
     484        for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
     485            if (m.member instanceof Way) {
     486                expectedWayIds.add(m.member.id);
     487            }
     488        }
     489        for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
     490            if (m.member instanceof Way) {
     491                expectedWayIds.add(m.member.id);
     492            }
     493        }
     494        for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
    495495            if (m.member instanceof Way) {
    496496                expectedWayIds.add(m.member.id);
Note: See TracChangeset for help on using the changeset viewer.