Changeset 1750 in josm for trunk/test/unit/org


Ignore:
Timestamp:
2009-07-08T21:50:32+02:00 (12 years ago)
Author:
Gubaer
Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

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  
    102102
    103103        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));
    106106    }
    107107
  • trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

    r1707 r1750  
    722722        Way merged = (Way)my.getPrimitiveById(3);
    723723        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));
    726726        assertEquals(myWay,merged);
    727727    }
Note: See TracChangeset for help on using the changeset viewer.