Changeset 8450 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
- Timestamp:
- 2015-06-03T01:27:41+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
r7937 r8450 5 5 import static org.junit.Assert.assertFalse; 6 6 import static org.junit.Assert.assertNotNull; 7 import static org.junit.Assert.assertNotSame; 8 import static org.junit.Assert.assertSame; 7 9 import static org.junit.Assert.assertTrue; 8 10 … … 91 93 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 92 94 assertTrue(visitor.getConflicts().isEmpty()); 93 assert True(n1 !=n2); // make sure we have a clone95 assertNotSame(n1, n2); // make sure we have a clone 94 96 assertEquals(1, n2.getId()); 95 97 assertEquals(1, n2.getVersion()); 96 assert Equals(false,n2.isModified());98 assertFalse(n2.isModified()); 97 99 assertEquals("value1", n2.get("key1")); 98 100 99 101 // merge target not modified after merging 100 assert True(!n2.isModified());102 assertFalse(n2.isModified()); 101 103 } 102 104 … … 127 129 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 128 130 assertTrue(visitor.getConflicts().isEmpty()); 129 assert True(n ==n2); // make sure the merged node is still the original node130 assert True(n2.getDataSet() ==my);131 assertSame(n, n2); // make sure the merged node is still the original node 132 assertSame(n2.getDataSet(), my); 131 133 assertEquals(1, n2.getId()); 132 134 assertEquals(2, n2.getVersion()); 133 assert Equals(false,n2.isModified());135 assertFalse(n2.isModified()); 134 136 assertEquals("value1-new", n2.get("key1")); 135 137 assertEquals("value2", n2.get("key2")); 136 138 137 139 // the merge target should not be modified 138 assert True(!n2.isModified());140 assertFalse(n2.isModified()); 139 141 } 140 142 … … 168 170 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 169 171 assertEquals(1,visitor.getConflicts().size()); 170 assert True(n ==n2);171 assert True(n1 !=n2);172 assert True(n1.getDataSet() ==their);172 assertSame(n, n2); 173 assertNotSame(n1, n2); 174 assertSame(n1.getDataSet(), their); 173 175 } 174 176 … … 201 203 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 202 204 assertEquals(1,visitor.getConflicts().size()); 203 assert True(n ==n2);204 assert True(n1 !=n2);205 assert True(n1.getDataSet() ==their);205 assertSame(n, n2); 206 assertNotSame(n1, n2); 207 assertSame(n1.getDataSet(), their); 206 208 } 207 209 … … 228 230 Node n2 = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 229 231 assertEquals(0,visitor.getConflicts().size()); 230 assert Equals(true,n2.isVisible());231 assert True(n ==n2);232 assert True(n.getDataSet() ==my);233 assert True(n1.getDataSet() ==their);232 assertTrue(n2.isVisible()); 233 assertSame(n, n2); 234 assertSame(n.getDataSet(), my); 235 assertSame(n1.getDataSet(), their); 234 236 } 235 237 … … 253 255 254 256 assertEquals(0, visitor.getConflicts().size()); 255 assert True(n.getDataSet() ==my);256 assert True(n1.getDataSet() ==their);257 assertSame(n.getDataSet(), my); 258 assertSame(n1.getDataSet(), their); 257 259 } 258 260 … … 279 281 assertEquals(0,visitor.getConflicts().size()); 280 282 Node n2 = (Node)my.getNodes().toArray()[0]; 281 assert True(n2 ==n);283 assertSame(n2, n); 282 284 assertTrue(n2.isDeleted()); 283 285 } … … 322 324 assertEquals(0,visitor.getConflicts().size()); 323 325 assertEquals("value1",n2.get("key1")); 324 assert Equals(true,n1.getTimestamp().equals(n2.getTimestamp()));326 assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); 325 327 assertEquals(theirUser,n2.getUser()); 326 assert True(n2 ==n);327 assert True(n2 !=n1);328 assert True(n2.getDataSet() ==my);328 assertSame(n2, n); 329 assertNotSame(n2, n1); 330 assertSame(n2.getDataSet(), my); 329 331 } 330 332 … … 356 358 assertEquals(0,visitor.getConflicts().size()); 357 359 assertEquals("value1",n2.get("key1")); 358 assert Equals(true,n1.getTimestamp().equals(n2.getTimestamp()));359 assert Equals(false,n2.isIncomplete());360 assert True(n2 ==n);360 assertTrue(n1.getTimestamp().equals(n2.getTimestamp())); 361 assertFalse(n2.isIncomplete()); 362 assertSame(n2, n); 361 363 } 362 364 … … 423 425 assertEquals(1,merged.getNode(0).getId()); 424 426 assertEquals(2,merged.getNode(1).getId()); 425 assert True(merged ==myWay);426 assert True(merged.getDataSet() ==my);427 assertSame(merged, myWay); 428 assertSame(merged.getDataSet(), my); 427 429 428 430 Node mergedNode = (Node)my.getPrimitiveById(1, OsmPrimitiveType.NODE); 429 assert True(mergedNode ==n1);431 assertSame(mergedNode, n1); 430 432 mergedNode = (Node)my.getPrimitiveById(2, OsmPrimitiveType.NODE); 431 assert True(mergedNode ==n2);432 433 assert True(!merged.isModified());433 assertSame(mergedNode, n2); 434 435 assertFalse(merged.isModified()); 434 436 } 435 437 … … 498 500 assertEquals("value1",merged.getNode(2).get("key1")); 499 501 500 assertTrue(merged.getNode(0) == n1); 501 assertTrue(merged.getNode(1) != n5); // must be clone of the original node in their 502 assertTrue(merged.getNode(2) == n2); 503 504 assertTrue(!merged.isModified()); // the target wasn't modified before merging, it 505 // mustn't be after merging 502 assertSame(merged.getNode(0), n1); 503 assertNotSame(merged.getNode(1), n5); // must be clone of the original node in their 504 assertSame(merged.getNode(2), n2); 505 506 assertFalse(merged.isModified()); // the target wasn't modified before merging, it mustn't be after merging 506 507 } 507 508 … … 613 614 Way merged = (Way)my.getPrimitiveById(3, OsmPrimitiveType.WAY); 614 615 assertEquals(1,visitor.getConflicts().size()); 615 assert Equals(true,visitor.getConflicts().hasConflictForMy(myWay));616 assert Equals(true,visitor.getConflicts().hasConflictForTheir(theirWay));616 assertTrue(visitor.getConflicts().hasConflictForMy(myWay)); 617 assertTrue(visitor.getConflicts().hasConflictForTheir(theirWay)); 617 618 assertEquals(myWay,merged); 618 619 } … … 669 670 assertEquals(1111, merged.getUser().getId()); 670 671 assertEquals(theirWay.getTimestamp(), merged.getTimestamp()); 671 assert True(merged ==myWay);672 assert True(merged.getNode(0) ==n1);673 assert True(merged.getNode(1) ==n2);674 675 assert True(!merged.isModified());672 assertSame(merged, myWay); 673 assertSame(merged.getNode(0), n1); 674 assertSame(merged.getNode(1), n2); 675 676 assertFalse(merged.isModified()); 676 677 } 677 678 … … 723 724 assertEquals(1111, merged.getUser().getId()); 724 725 assertEquals(theirWay.getTimestamp(), merged.getTimestamp()); 725 assert True(merged ==myWay);726 assert True(merged.getNode(0) ==n1);727 assert True(merged.getNode(1) ==n2);728 729 assert True(!merged.isModified());726 assertSame(merged, myWay); 727 assertSame(merged.getNode(0), n1); 728 assertSame(merged.getNode(1), n2); 729 730 assertFalse(merged.isModified()); 730 731 } 731 732 … … 830 831 831 832 Node n = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); 832 assert True(n != null);833 assertNotNull(n); 833 834 834 835 assertEquals(1, visitor.getConflicts().size()); … … 926 927 OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); 927 928 assertNotNull(p); 928 assert True(!p.isIncomplete());929 assertFalse(p.isIncomplete()); 929 930 p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); 930 931 assertNotNull(p); 931 assert True(!p.isIncomplete());932 assertFalse(p.isIncomplete()); 932 933 p= my.getPrimitiveById(3,OsmPrimitiveType.WAY); 933 934 assertNotNull(p); 934 assert True(!p.isIncomplete());935 assertFalse(p.isIncomplete()); 935 936 936 937 Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY); 937 938 assertNotNull(w); 938 assert True(!p.isIncomplete());939 assertFalse(p.isIncomplete()); 939 940 assertEquals(2, w.getNodesCount()); 940 assert True(!w.getNode(0).isIncomplete());941 assert True(!w.getNode(1).isIncomplete());941 assertFalse(w.getNode(0).isIncomplete()); 942 assertFalse(w.getNode(1).isIncomplete()); 942 943 } 943 944
Note:
See TracChangeset
for help on using the changeset viewer.