Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 16438) +++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 16442) @@ -242,6 +242,6 @@ assertNotNull(w); - DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(n).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -260,19 +260,19 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Node node : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Node node : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(node.getId())); assertFalse(node.isIncomplete()); } - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { assertTrue(expectedWayIds.contains(way.getId())); assertEquals(n.getReferrers().contains(way), !way.isIncomplete()); } - for (Relation relation : referers.getRelations()) { + for (Relation relation : referrers.getRelations()) { assertTrue(expectedRelationIds.contains(relation.getId())); assertFalse(relation.isIncomplete()); @@ -280,8 +280,8 @@ } - private void printNumberOfPrimitives(DataSet referers) { - System.out.println("#nodes=" + referers.getNodes().size() + - " #ways=" + referers.getWays().size() + - " #relations=" + referers.getRelations().size()); + private void printNumberOfPrimitives(DataSet referrers) { + System.out.println("#nodes=" + referrers.getNodes().size() + + " #ways=" + referrers.getWays().size() + + " #relations=" + referrers.getRelations().size()); } @@ -296,6 +296,6 @@ assertNotNull(n); - DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(n).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -313,19 +313,19 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Node node : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Node node : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(node.getId())); assertFalse(node.isIncomplete()); } - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { assertTrue(expectedWayIds.contains(way.getId())); assertFalse(way.isIncomplete()); } - for (Relation relation : referers.getRelations()) { + for (Relation relation : referrers.getRelations()) { assertTrue(expectedRelationIds.contains(relation.getId())); assertFalse(relation.isIncomplete()); @@ -345,6 +345,6 @@ // - DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(w).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -360,17 +360,17 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Way w1 : referers.getWays()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Way w1 : referrers.getWays()) { assertTrue(w1.isIncomplete()); } - assertEquals(2, referers.getRelations().size()); // two relations referring to w - - Relation r = lookupRelation(referers, 0); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 1); + assertEquals(2, referrers.getRelations().size()); // two relations referring to w + + Relation r = lookupRelation(referrers, 0); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 1); assertFalse(r.isIncomplete()); } @@ -388,12 +388,12 @@ // - DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(6, referers.getWays().size()); // 6 ways referred by two relations - for (Way w1 : referers.getWays()) { + DataSet referrers = new OsmServerBackreferenceReader(w).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + assertEquals(6, referrers.getWays().size()); // 6 ways referred by two relations + for (Way w1 : referrers.getWays()) { assertFalse(w1.isIncomplete()); } - assertEquals(2, referers.getRelations().size()); // two relations referring to + assertEquals(2, referrers.getRelations().size()); // two relations referring to Set expectedNodeIds = new HashSet<>(); - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { Way orig = (Way) ds.getPrimitiveById(way); for (Node n : orig.getNodes()) { @@ -401,13 +401,13 @@ } } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - for (Node n : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + for (Node n : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(n.getId())); } - Relation r = lookupRelation(referers, 0); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 1); + Relation r = lookupRelation(referrers, 0); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 1); assertFalse(r.isIncomplete()); } @@ -426,26 +426,26 @@ // - DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(r).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set referringRelationsIds = new HashSet<>(); - Relation r6 = lookupRelation(referers, 6); + Relation r6 = lookupRelation(referrers, 6); assertNotNull(r6); assertFalse(r6.isIncomplete()); referringRelationsIds.add(r6.getId()); - Relation r7 = lookupRelation(referers, 7); + Relation r7 = lookupRelation(referrers, 7); assertNotNull(r7); assertFalse(r7.isIncomplete()); referringRelationsIds.add(r7.getId()); - Relation r8 = lookupRelation(referers, 8); + Relation r8 = lookupRelation(referrers, 8); assertNotNull(r8); assertFalse(r8.isIncomplete()); referringRelationsIds.add(r8.getId()); - Relation r9 = lookupRelation(referers, 9); + Relation r9 = lookupRelation(referrers, 9); assertNotNull(r9); assertFalse(r9.isIncomplete()); referringRelationsIds.add(r9.getId()); - for (Relation r1 : referers.getRelations()) { + for (Relation r1 : referrers.getRelations()) { if (!referringRelationsIds.contains(r1.getId())) { assertTrue(r1.isIncomplete()); @@ -478,6 +478,6 @@ } - assertEquals(expectedWayIds.size(), referers.getWays().size()); - for (Way w1 : referers.getWays()) { + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + for (Way w1 : referrers.getWays()) { assertTrue(expectedWayIds.contains(w1.getId())); assertTrue(w1.isIncomplete()); @@ -491,5 +491,5 @@ } } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); } @@ -544,16 +544,16 @@ // - DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - - r = lookupRelation(referers, 6); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 7); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 8); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 9); + DataSet referrers = new OsmServerBackreferenceReader(r).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + + r = lookupRelation(referrers, 6); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 7); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 8); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 9); assertNotNull(r); assertFalse(r.isIncomplete()); @@ -561,5 +561,5 @@ // all relations are fully loaded // - for (Relation r1 : referers.getRelations()) { + for (Relation r1 : referrers.getRelations()) { assertFalse(r1.isIncomplete()); } @@ -590,5 +590,5 @@ } for (long id : expectedWayIds) { - Way w = (Way) referers.getPrimitiveById(id, OsmPrimitiveType.WAY); + Way w = (Way) referrers.getPrimitiveById(id, OsmPrimitiveType.WAY); assertNotNull(w); assertFalse(w.isIncomplete()); @@ -601,6 +601,6 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - for (Node n : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + for (Node n : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(n.getId())); }