Changeset 3034 in josm for trunk/test/functional/org

Timestamp:

2010-02-23T08:58:12+01:00 (14 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)

Location:

trunk/test/functional/org/openstreetmap/josm/gui

Files:

• conflict/pair/nodes/NodeListMergerTest.java (modified) (3 diffs)
• conflict/pair/properties/PropertiesMergerTest.java (modified) (2 diffs)
• conflict/pair/relation/RelationMemberMergerTest.java (modified) (2 diffs)
• dialogs/ConflictResolutionDialogTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
 
 public class NodeListMergerTest extends JFrame {
@@ -35 +36 @@
         w2.addNode(new Node(6));
 
-        nodeListMerger.populate(w1, w2);
+        nodeListMerger.populate(new Conflict<OsmPrimitive>(w1, w2));
 
     }
@@ -49 +50 @@
             w2.addNode(new Node(i));
         }
-        nodeListMerger.populate(w1, w2);
+        nodeListMerger.populate(new Conflict<OsmPrimitive>(w1, w2));
 
     }

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

@@ -7 +7 @@
 
 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.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.projection.Epsg4326;
-import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
 
 public class PropertiesMergerTest extends JFrame{
@@ -31 +32 @@
         their.setCoor(new LatLon(10,10));
 
-        merger.getModel().populate(my, their);
+        merger.getModel().populate(new Conflict<OsmPrimitive>(my, their));
     }
 

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 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.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
 
 public class RelationMemberMergerTest extends JFrame {
@@ -28 +29 @@
         r2.addMember(new RelationMember("role3", new Relation(3)));
 
-        merger.populate(r1, r2);
+        merger.populate(new Conflict<OsmPrimitive>(r1, r2));
 
     }

trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

@@ -4 +4 @@
 import javax.swing.JFrame;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 
@@ -27 +29 @@
         w2.addNode(new Node(11));
 
-        dialog.getConflictResolver().populate(w1, w2);
+        dialog.getConflictResolver().populate(new Conflict<OsmPrimitive>(w1, w2));
     }