Changeset 3053 in josm for trunk/test


Ignore:
Timestamp:
2010-02-27T15:46:00+01:00 (10 years ago)
Author:
jttt
Message:

Fix tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

    r3034 r3053  
    292292    /**
    293293     * My and their node are new but semantically equal. My node is deleted.
    294      *
    295      * => create a conflict
    296      *
     294     *
     295     * => Ignore my node, no conflict
    297296     */
    298297    @Test
     
    309308        visitor.merge();
    310309
    311         assertEquals(1,visitor.getConflicts().size());
     310        assertEquals(0, visitor.getConflicts().size());
    312311        assertTrue(n.getDataSet() == my);
    313312        assertTrue(n1.getDataSet() == their);
Note: See TracChangeset for help on using the changeset viewer.