Changeset 1750 in josm for trunk/test/unit/org
- Timestamp:
- 2009-07-08T21:50:32+02:00 (15 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/data/osm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
r1670 r1750 102 102 103 103 assertEquals(2, ids.size()); 104 assertEquals(1, ids.get(0));105 assertEquals(2, ids.get(1));104 assertEquals(1, (long) ids.get(0)); 105 assertEquals(2, (long) ids.get(1)); 106 106 } 107 107 -
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r1707 r1750 722 722 Way merged = (Way)my.getPrimitiveById(3); 723 723 assertEquals(1,visitor.getConflicts().size()); 724 assertEquals(true, visitor.getConflicts(). keySet().contains(myWay));725 assertEquals(true, visitor.getConflicts(). values().contains(theirWay));724 assertEquals(true, visitor.getConflicts().hasConflictForMy(myWay)); 725 assertEquals(true, visitor.getConflicts().hasConflictForTheir(theirWay)); 726 726 assertEquals(myWay,merged); 727 727 }
Note:
See TracChangeset
for help on using the changeset viewer.