Changeset 2077 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict

Timestamp:

2009-09-07T23:06:19+02:00 (15 years ago)

Author:

Gubaer

Message:

Had to replace DataSet:getPrimitiveById(id) with DataSet:getPrimitiveById(id,type). Primitive ids are not globally unique, only per type of primitive.
Fixed problems in unit test, available unit tests passing again.

File:

• trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -26 +26 @@
         Node my = new Node(1);
         my.setCoor(new LatLon(1,1));
-        my.deleted = true;
+        my.setDeleted(true);
 
         Node their = new Node(2);