Changeset 3034 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties

Timestamp:

2010-02-23T08:58:12+01:00 (15 years ago)

Author:

jttt

Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

@@ -12 +12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -47 +49 @@
     }
 
+    private void populate(OsmPrimitive my, OsmPrimitive their) {
+        model.populate(new Conflict<OsmPrimitive>(my, their));
+    }
+
     @Test
     public void populate() {
@@ -55 +61 @@
         d1.addPrimitive(n1);
         d2.addPrimitive(n2);
-        model.populate(n1, n2);
+        populate(n1, n2);
 
         Way w1 = new Way(1);
@@ -61 +67 @@
         d1.addPrimitive(w1);
         d2.addPrimitive(w2);
-        model.populate(w2, w2);
+        populate(w2, w2);
 
         Relation r1 = new Relation(1);
@@ -67 +73 @@
         d1.addPrimitive(r1);
         d2.addPrimitive(r2);
-        model.populate(r1, r2);
+        populate(r1, r2);
     }
 
@@ -79 +85 @@
         d1.addPrimitive(n1);
         d2.addPrimitive(n2);
-        model.populate(n1, n2);
+        populate(n1, n2);
         assertFalse(model.hasCoordConflict());
 
         n1.setCoor(new LatLon(1,1));
-        model.populate(n1, n2);
+        populate(n1, n2);
         assertTrue(model.hasCoordConflict());
 
@@ -89 +95 @@
         n1.cloneFrom(new Node(1));
         n2.setCoor(new LatLon(2,2));
-        model.populate(n1, n2);
+        populate(n1, n2);
         assertTrue(model.hasCoordConflict());
 
         n1.setCoor(new LatLon(1,1));
         n2.setCoor(new LatLon(2,2));
-        model.populate(n1, n2);
+        populate(n1, n2);
         assertTrue(model.hasCoordConflict());