Changeset 2077 in josm for trunk/test/unit/org/openstreetmap/josm/data
- Timestamp:
- 2009-09-07T23:06:19+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
r1951 r2077 14 14 import org.openstreetmap.josm.data.osm.Node; 15 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; 16 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 16 17 import org.openstreetmap.josm.data.osm.Relation; 17 18 import org.openstreetmap.josm.data.osm.RelationMember; … … 50 51 assertEquals(2, hull.nodes.size()); 51 52 52 OsmPrimitive p = hull.getPrimitiveById(1 );53 OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); 53 54 assertNotNull(p); 54 55 assertEquals(p.getClass(), Node.class); 55 56 56 p = hull.getPrimitiveById(3 );57 p = hull.getPrimitiveById(3,OsmPrimitiveType.NODE); 57 58 assertNull(p); 58 59 … … 71 72 Node n2 = new Node(2); 72 73 Way w1 = new Way(3); 74 w1.incomplete = false; 73 75 w1.addNode(n1); 74 76 w1.addNode(n2); … … 84 86 assertEquals(2, hull.nodes.size()); 85 87 86 OsmPrimitive p = hull.getPrimitiveById(1 );88 OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); 87 89 assertNotNull(p); 88 90 assertEquals(p.getClass(), Node.class); 89 91 90 p = hull.getPrimitiveById(2 );92 p = hull.getPrimitiveById(2,OsmPrimitiveType.NODE); 91 93 assertNotNull(p); 92 94 assertEquals(p.getClass(), Node.class); 93 95 94 p = hull.getPrimitiveById(3 );96 p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY); 95 97 assertNotNull(p); 96 98 assertEquals(p.getClass(), Way.class); … … 103 105 Node n2 = new Node(2); 104 106 Way w1 = new Way(3); 107 w1.incomplete = false; 105 108 w1.addNode(n1); 106 109 w1.addNode(n2); … … 116 119 assertEquals(2, hull.nodes.size()); 117 120 118 OsmPrimitive p = hull.getPrimitiveById(1 );121 OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); 119 122 assertNotNull(p); 120 123 assertEquals(p.getClass(), Node.class); 121 124 122 p = hull.getPrimitiveById(2 );125 p = hull.getPrimitiveById(2, OsmPrimitiveType.NODE); 123 126 assertNotNull(p); 124 127 assertEquals(p.getClass(), Node.class); 125 128 126 p = hull.getPrimitiveById(3 );129 p = hull.getPrimitiveById(3,OsmPrimitiveType.WAY); 127 130 assertNotNull(p); 128 131 assertEquals(p.getClass(), Way.class); … … 142 145 assertEquals(1, hull.ways.size()); 143 146 144 OsmPrimitive p = hull.getPrimitiveById(3 );147 OsmPrimitive p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY); 145 148 assertNotNull(p); 146 149 assertEquals(p.getClass(), Way.class); … … 154 157 Node n20 = new Node(20); 155 158 r1.addMember(new RelationMember("node-20",n20)); 159 r1.incomplete = false; 156 160 Way w30 = new Way(30); 161 w30.incomplete = false; 157 162 Node n21; 158 163 w30.addNode(n21 = new Node(21)); … … 177 182 assertEquals(2, hull.relations.size()); 178 183 179 OsmPrimitive p = hull.getPrimitiveById(1 );184 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 180 185 assertNotNull(p); 181 186 assertEquals(p.getClass(), Relation.class); 182 187 183 Way w = (Way)hull.getPrimitiveById(30 );188 Way w = (Way)hull.getPrimitiveById(30,OsmPrimitiveType.WAY); 184 189 assertNotNull(w); 185 190 assertEquals(2, w.getNodesCount()); 186 Node n = (Node)hull.getPrimitiveById(21 );191 Node n = (Node)hull.getPrimitiveById(21, OsmPrimitiveType.NODE); 187 192 assertNotNull(n); 188 193 assertTrue(w.containsNode(n)); 189 194 190 n = (Node)hull.getPrimitiveById(22 );195 n = (Node)hull.getPrimitiveById(22,OsmPrimitiveType.NODE); 191 196 assertNotNull(n); 192 197 assertTrue(w.containsNode(n)); 193 198 194 Relation r = (Relation)hull.getPrimitiveById(40 );195 assertNotNull(r); 196 197 r = (Relation)hull.getPrimitiveById(1 );199 Relation r = (Relation)hull.getPrimitiveById(40,OsmPrimitiveType.RELATION); 200 assertNotNull(r); 201 202 r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 198 203 assertNotNull(r); 199 204 assertEquals(3, r.getMembersCount()); 200 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20 ));201 assertTrue(r.getMembers().contains(m)); 202 m = new RelationMember("way-30", hull.getPrimitiveById(30 ));203 assertTrue(r.getMembers().contains(m)); 204 m = new RelationMember("relation-40", hull.getPrimitiveById(40 ));205 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20,OsmPrimitiveType.NODE)); 206 assertTrue(r.getMembers().contains(m)); 207 m = new RelationMember("way-30", hull.getPrimitiveById(30, OsmPrimitiveType.WAY)); 208 assertTrue(r.getMembers().contains(m)); 209 m = new RelationMember("relation-40", hull.getPrimitiveById(40, OsmPrimitiveType.RELATION)); 205 210 assertTrue(r.getMembers().contains(m)); 206 211 } … … 213 218 r1.addMember(new RelationMember("node-20",n20)); 214 219 Way w30 = new Way(30); 220 w30.incomplete = false; 215 221 Node n21; 216 222 w30.addNode(n21 = new Node(21)); … … 235 241 assertEquals(2, hull.relations.size()); 236 242 237 OsmPrimitive p = hull.getPrimitiveById(1 );243 OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 238 244 assertNotNull(p); 239 245 assertEquals(p.getClass(), Relation.class); 240 246 241 Way w = (Way)hull.getPrimitiveById(30 );247 Way w = (Way)hull.getPrimitiveById(30, OsmPrimitiveType.WAY); 242 248 assertNotNull(w); 243 249 assertTrue(w.incomplete); 244 250 245 251 246 Node n = (Node)hull.getPrimitiveById(21 );252 Node n = (Node)hull.getPrimitiveById(21,OsmPrimitiveType.NODE); 247 253 assertNull(n); 248 254 249 n = (Node)hull.getPrimitiveById(22 );255 n = (Node)hull.getPrimitiveById(22, OsmPrimitiveType.NODE); 250 256 assertNull(n); 251 257 252 Relation r = (Relation)hull.getPrimitiveById(40 );258 Relation r = (Relation)hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); 253 259 assertNotNull(r); 254 260 assertTrue(r.incomplete); 255 261 256 r = (Relation)hull.getPrimitiveById(1 );262 r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 257 263 assertNotNull(r); 258 264 assertEquals(3, r.getMembersCount()); 259 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20 ));260 assertTrue(r.getMembers().contains(m)); 261 m = new RelationMember("way-30", hull.getPrimitiveById(30 ));262 assertTrue(r.getMembers().contains(m)); 263 m = new RelationMember("relation-40", hull.getPrimitiveById(40 ));265 RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20, OsmPrimitiveType.NODE)); 266 assertTrue(r.getMembers().contains(m)); 267 m = new RelationMember("way-30", hull.getPrimitiveById(30, OsmPrimitiveType.WAY)); 268 assertTrue(r.getMembers().contains(m)); 269 m = new RelationMember("relation-40", hull.getPrimitiveById(40, OsmPrimitiveType.RELATION)); 264 270 assertTrue(r.getMembers().contains(m)); 265 271 } … … 272 278 Node n20 = new Node(new LatLon(20.0,20.0)); 273 279 n20.put("name", "n20"); 274 r1.getMembers().add(new RelationMember("node-20",n20)); 280 r1.addMember(new RelationMember("node-20",n20)); 281 275 282 Way w30 = new Way(); 276 283 w30.put("name", "w30"); … … 285 292 r40.put("name", "r40"); 286 293 r1.addMember(new RelationMember("relation-40", r40)); 294 287 295 source.nodes.add(n20); 288 296 source.nodes.add(n21); … … 343 351 assertEquals(1, hull.relations.size()); 344 352 345 Relation r = (Relation)hull.getPrimitiveById(1 );353 Relation r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 346 354 assertNotNull(r); 347 355 assertEquals(1, r.getMembersCount()); … … 385 393 assertEquals(2, hull.relations.size()); 386 394 387 r1 = (Relation)hull.getPrimitiveById(1 );395 r1 = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); 388 396 assertNotNull(r1); 389 r2 = (Relation)hull.getPrimitiveById(2 );397 r2 = (Relation)hull.getPrimitiveById(2, OsmPrimitiveType.RELATION); 390 398 assertNotNull(r2); 391 399 assertEquals(1, r1.getMembersCount()); -
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r2071 r2077 24 24 import org.openstreetmap.josm.data.osm.Node; 25 25 import org.openstreetmap.josm.data.osm.OsmPrimitive; 26 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 26 27 import org.openstreetmap.josm.data.osm.Relation; 27 28 import org.openstreetmap.josm.data.osm.RelationMember; … … 97 98 visitor.merge(); 98 99 99 Node n2 = (Node)my.getPrimitiveById(1 );100 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 100 101 assertTrue(visitor.getConflicts().isEmpty()); 101 102 assertEquals(1, n2.getId()); … … 133 134 visitor.merge(); 134 135 135 Node n2 = (Node)my.getPrimitiveById(1 );136 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 136 137 assertTrue(visitor.getConflicts().isEmpty()); 137 138 assertEquals(1, n2.getId()); … … 173 174 visitor.merge(); 174 175 175 Node n2 = (Node)my.getPrimitiveById(1 );176 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 176 177 assertEquals(1,visitor.getConflicts().size()); 177 178 assertEquals(n, n2); … … 209 210 visitor.merge(); 210 211 211 Node n2 = (Node)my.getPrimitiveById(1 );212 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 212 213 assertEquals(1,visitor.getConflicts().size()); 213 214 assertEquals(n, n2); … … 242 243 visitor.merge(); 243 244 244 Node n2 = (Node)my.getPrimitiveById(1 );245 Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); 245 246 assertEquals(1,visitor.getConflicts().size()); 246 247 assertEquals(true, n2.isVisible()); … … 271 272 visitor.merge(); 272 273 273 Node n2 = (Node)my.getPrimitiveById(1 );274 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 274 275 assertEquals(0,visitor.getConflicts().size()); 275 276 assertEquals(true, n2.isVisible()); … … 354 355 visitor.merge(); 355 356 356 Node n2 = (Node)my.getPrimitiveById(1 );357 Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); 357 358 assertEquals(0,visitor.getConflicts().size()); 358 359 assertEquals(2,my.nodes.size()); … … 501 502 visitor.merge(); 502 503 503 Way merged = (Way)my.getPrimitiveById(3 );504 Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 504 505 assertEquals(0,visitor.getConflicts().size()); 505 506 assertEquals("value1",merged.get("key1")); … … 571 572 visitor.merge(); 572 573 573 Way merged = (Way)my.getPrimitiveById(3 );574 Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 574 575 assertEquals(0,visitor.getConflicts().size()); 575 576 assertEquals(3,merged.getId()); … … 642 643 visitor.merge(); 643 644 644 Way merged = (Way)my.getPrimitiveById(3 );645 Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 645 646 assertEquals(1,visitor.getConflicts().size()); 646 647 assertEquals(3,merged.getId()); … … 690 691 visitor.merge(); 691 692 692 Way merged = (Way)my.getPrimitiveById(3 );693 Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 693 694 assertEquals(1,visitor.getConflicts().size()); 694 695 assertEquals(true, visitor.getConflicts().hasConflictForMy(myWay)); … … 851 852 assertEquals(0,visitor.getConflicts().size()); 852 853 853 Way myWay = (Way)my.getPrimitiveById(4 );854 Way myWay = (Way)my.getPrimitiveById(4,OsmPrimitiveType.WAY); 854 855 assertEquals(2, myWay.getNodesCount()); 855 856 856 Node n = (Node)my.getPrimitiveById(1 );857 Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); 857 858 assertTrue(n != null); 858 859 } … … 906 907 assertEquals(0,visitor.getConflicts().size()); 907 908 908 Relation r = (Relation)my.getPrimitiveById(4 );909 Relation r = (Relation)my.getPrimitiveById(4,OsmPrimitiveType.RELATION); 909 910 assertEquals(2, r.getMembersCount()); 910 911 911 Node n = (Node)my.getPrimitiveById(1 );912 Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); 912 913 assertTrue(n != null); 913 914 } … … 942 943 assertEquals(0,visitor.getConflicts().size()); 943 944 944 OsmPrimitive p= my.getPrimitiveById(1 );945 OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); 945 946 assertNotNull(p); 946 947 assertTrue(p.incomplete); 947 p= my.getPrimitiveById(2 );948 p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); 948 949 assertNotNull(p); 949 950 assertTrue(p.incomplete); 950 p= my.getPrimitiveById(3 );951 p= my.getPrimitiveById(3, OsmPrimitiveType.WAY); 951 952 assertNotNull(p); 952 953 assertTrue(p.incomplete); 953 954 954 Way w = (Way)my.getPrimitiveById(3 );955 Way w = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 955 956 assertNotNull(w); 956 957 assertTrue(p.incomplete); … … 1005 1006 assertEquals(0,visitor.getConflicts().size()); 1006 1007 1007 OsmPrimitive p= my.getPrimitiveById(1 );1008 OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); 1008 1009 assertNotNull(p); 1009 1010 assertTrue(!p.incomplete); 1010 p= my.getPrimitiveById(2 );1011 p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); 1011 1012 assertNotNull(p); 1012 1013 assertTrue(!p.incomplete); 1013 p= my.getPrimitiveById(3 );1014 p= my.getPrimitiveById(3,OsmPrimitiveType.WAY); 1014 1015 assertNotNull(p); 1015 1016 assertTrue(!p.incomplete); 1016 1017 1017 Way w = (Way)my.getPrimitiveById(3 );1018 Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY); 1018 1019 assertNotNull(w); 1019 1020 assertTrue(!p.incomplete);
Note:
See TracChangeset
for help on using the changeset viewer.