Changeset 3034 in josm for trunk/test/functional


Ignore:
Timestamp:
2010-02-23T08:58:12+01:00 (10 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java

    r2041 r3034  
    66import javax.swing.JFrame;
    77
     8import org.openstreetmap.josm.data.conflict.Conflict;
    89import org.openstreetmap.josm.data.osm.Node;
     10import org.openstreetmap.josm.data.osm.OsmPrimitive;
    911import org.openstreetmap.josm.data.osm.Way;
    10 import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
    1112
    1213public class NodeListMergerTest extends JFrame {
     
    3536        w2.addNode(new Node(6));
    3637
    37         nodeListMerger.populate(w1, w2);
     38        nodeListMerger.populate(new Conflict<OsmPrimitive>(w1, w2));
    3839
    3940    }
     
    4950            w2.addNode(new Node(i));
    5051        }
    51         nodeListMerger.populate(w1, w2);
     52        nodeListMerger.populate(new Conflict<OsmPrimitive>(w1, w2));
    5253
    5354    }
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

    r2077 r3034  
    77
    88import org.openstreetmap.josm.Main;
     9import org.openstreetmap.josm.data.conflict.Conflict;
    910import org.openstreetmap.josm.data.coor.LatLon;
    1011import org.openstreetmap.josm.data.osm.Node;
     12import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1113import org.openstreetmap.josm.data.projection.Epsg4326;
    12 import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
    1314
    1415public class PropertiesMergerTest extends JFrame{
     
    3132        their.setCoor(new LatLon(10,10));
    3233
    33         merger.getModel().populate(my, their);
     34        merger.getModel().populate(new Conflict<OsmPrimitive>(my, their));
    3435    }
    3536
  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java

    r2041 r3034  
    66import javax.swing.JFrame;
    77
     8import org.openstreetmap.josm.data.conflict.Conflict;
    89import org.openstreetmap.josm.data.osm.Node;
     10import org.openstreetmap.josm.data.osm.OsmPrimitive;
    911import org.openstreetmap.josm.data.osm.Relation;
    1012import org.openstreetmap.josm.data.osm.RelationMember;
    1113import org.openstreetmap.josm.data.osm.Way;
    12 import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
    1314
    1415public class RelationMemberMergerTest extends JFrame {
     
    2829        r2.addMember(new RelationMember("role3", new Relation(3)));
    2930
    30         merger.populate(r1, r2);
     31        merger.populate(new Conflict<OsmPrimitive>(r1, r2));
    3132
    3233    }
  • trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

    r1912 r3034  
    44import javax.swing.JFrame;
    55
     6import org.openstreetmap.josm.data.conflict.Conflict;
    67import org.openstreetmap.josm.data.osm.Node;
     8import org.openstreetmap.josm.data.osm.OsmPrimitive;
    79import org.openstreetmap.josm.data.osm.Way;
    810
     
    2729        w2.addNode(new Node(11));
    2830
    29         dialog.getConflictResolver().populate(w1, w2);
     31        dialog.getConflictResolver().populate(new Conflict<OsmPrimitive>(w1, w2));
    3032    }
    3133
Note: See TracChangeset for help on using the changeset viewer.