Changeset 1926 in josm for trunk/test
- Timestamp:
- 2009-08-08T09:22:24+02:00 (15 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
r1912 r1926 2 2 package org.openstreetmap.josm.data.osm.visitor; 3 3 4 import static org.junit.Assert.assertEquals; 5 import static org.junit.Assert.assertNotNull; 6 import static org.junit.Assert.assertNull; 7 import static org.junit.Assert.assertTrue; 8 4 9 import java.util.Collection; 5 10 6 import org.junit.Ignore;7 11 import org.junit.Test; 8 12 import org.openstreetmap.josm.data.coor.LatLon; … … 13 17 import org.openstreetmap.josm.data.osm.RelationMember; 14 18 import org.openstreetmap.josm.data.osm.Way; 15 16 import static org.junit.Assert.*;17 19 18 20 public class MergeSourceBuildingVisitorTest { … … 195 197 r = (Relation)hull.getPrimitiveById(1); 196 198 assertNotNull(r); 197 assertEquals(3, r. members.size());199 assertEquals(3, r.getMembersCount()); 198 200 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20)); 199 201 assertTrue(r.members.contains(m)); … … 254 256 r = (Relation)hull.getPrimitiveById(1); 255 257 assertNotNull(r); 256 assertEquals(3, r. members.size());258 assertEquals(3, r.getMembersCount()); 257 259 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20)); 258 260 assertTrue(r.members.contains(m)); … … 319 321 r = (Relation)lookupByName(hull.relations, "r1"); 320 322 assertNotNull(r); 321 assertEquals(3, r. members.size());323 assertEquals(3, r.getMembersCount()); 322 324 RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20")); 323 325 assertTrue(r.members.contains(m)); … … 343 345 Relation r = (Relation)hull.getPrimitiveById(1); 344 346 assertNotNull(r); 345 assertEquals(1, r. members.size());347 assertEquals(1, r.getMembersCount()); 346 348 assertTrue(r.members.contains(new RelationMember("relation-1",r))); 347 349 } … … 363 365 Relation r = (Relation)lookupByName(hull.relations, "r1"); 364 366 assertNotNull(r); 365 assertEquals(1, r. members.size());367 assertEquals(1, r.getMembersCount()); 366 368 assertTrue(r.members.contains(new RelationMember("relation-1",r))); 367 369 } … … 387 389 r2 = (Relation)hull.getPrimitiveById(2); 388 390 assertNotNull(r2); 389 assertEquals(1, r1. members.size());391 assertEquals(1, r1.getMembersCount()); 390 392 assertTrue(r1.members.contains(new RelationMember("relation-2",r2))); 391 assertEquals(1, r2. members.size());393 assertEquals(1, r2.getMembersCount()); 392 394 assertTrue(r2.members.contains(new RelationMember("relation-1",r1))); 393 395 } -
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r1910 r1926 972 972 973 973 Relation r = (Relation)my.getPrimitiveById(4); 974 assertEquals(2, r. members.size());974 assertEquals(2, r.getMembersCount()); 975 975 976 976 Node n = (Node)my.getPrimitiveById(1);
Note:
See TracChangeset
for help on using the changeset viewer.