Changeset 3025 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
- Timestamp:
- 2010-02-19T21:43:42+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
r2620 r3025 151 151 public void test_OneRelation_ExistingMembersSelected() { 152 152 DataSet source = new DataSet(); 153 Relation r1 = new Relation(1 );153 Relation r1 = new Relation(1, 1); 154 154 Node n20 = new Node(20, 1); 155 n20.setCoor(new LatLon(0, 0)); 155 156 r1.addMember(new RelationMember("node-20",n20)); 156 157 Way w30 = new Way(30, 1); 157 Node n21 ;158 w30.addNode(n21 = new Node(21));159 Node n22 ;160 w30.addNode(n22 = new Node(22));158 Node n21 = new Node(21); 159 w30.addNode(n21); 160 Node n22 = new Node(22); 161 w30.addNode(n22); 161 162 r1.addMember(new RelationMember("way-30",w30)); 162 163 Relation r40 = new Relation(40); … … 166 167 source.addPrimitive(n22); 167 168 source.addPrimitive(w30); 168 source.addPrimitive(r1);169 169 source.addPrimitive(r40); 170 source.addPrimitive(r1); 170 171 source.setSelected(r1,n20,w30,r40); 171 172 … … 209 210 public void test_OneRelation_ExistingMembersNotSelected() { 210 211 DataSet source = new DataSet(); 211 Relation r1 = new Relation(1 );212 Relation r1 = new Relation(1, 1); 212 213 Node n20 = new Node(20); 213 214 r1.addMember(new RelationMember("node-20",n20)); … … 224 225 source.addPrimitive(n22); 225 226 source.addPrimitive(w30); 226 source.addPrimitive(r1);227 227 source.addPrimitive(r40); 228 source.addPrimitive(r1); 228 229 source.setSelected(r1); 229 230 … … 291 292 source.addPrimitive(n22); 292 293 source.addPrimitive(w30); 293 source.addPrimitive(r1);294 294 source.addPrimitive(r40); 295 source.addPrimitive(r1); 295 296 source.setSelected(r1); 296 297 … … 335 336 public void test_OneRelation_Existing_Recursive() { 336 337 DataSet source = new DataSet(); 337 Relation r1 = new Relation(1 );338 Relation r1 = new Relation(1, 1); 338 339 r1.addMember(new RelationMember("relation-1",r1)); 339 340 source.addPrimitive(r1); … … 374 375 public void test_TwoRelation_Existing_Circular() { 375 376 DataSet source = new DataSet(); 376 Relation r1 = new Relation(1); 377 Relation r2 = new Relation(2); 377 Relation r1 = new Relation(1, 1); 378 source.addPrimitive(r1); 379 Relation r2 = new Relation(2, 3); 380 source.addPrimitive(r2); 378 381 r1.addMember(new RelationMember("relation-2",r2)); 379 382 r2.addMember(new RelationMember("relation-1",r1)); 380 source.addPrimitive(r1);381 source.addPrimitive(r2);382 383 source.setSelected(r1,r2); 383 384
Note:
See TracChangeset
for help on using the changeset viewer.