Changeset 3034 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2010-02-23T08:58:12+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
r3025 r3034 12 12 import org.junit.Test; 13 13 import org.openstreetmap.josm.Main; 14 import org.openstreetmap.josm.data.conflict.Conflict; 14 15 import org.openstreetmap.josm.data.coor.LatLon; 15 16 import org.openstreetmap.josm.data.osm.DataSet; 16 17 import org.openstreetmap.josm.data.osm.Node; 18 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 19 import org.openstreetmap.josm.data.osm.Relation; 18 20 import org.openstreetmap.josm.data.osm.Way; … … 47 49 } 48 50 51 private void populate(OsmPrimitive my, OsmPrimitive their) { 52 model.populate(new Conflict<OsmPrimitive>(my, their)); 53 } 54 49 55 @Test 50 56 public void populate() { … … 55 61 d1.addPrimitive(n1); 56 62 d2.addPrimitive(n2); 57 model.populate(n1, n2);63 populate(n1, n2); 58 64 59 65 Way w1 = new Way(1); … … 61 67 d1.addPrimitive(w1); 62 68 d2.addPrimitive(w2); 63 model.populate(w2, w2);69 populate(w2, w2); 64 70 65 71 Relation r1 = new Relation(1); … … 67 73 d1.addPrimitive(r1); 68 74 d2.addPrimitive(r2); 69 model.populate(r1, r2);75 populate(r1, r2); 70 76 } 71 77 … … 79 85 d1.addPrimitive(n1); 80 86 d2.addPrimitive(n2); 81 model.populate(n1, n2);87 populate(n1, n2); 82 88 assertFalse(model.hasCoordConflict()); 83 89 84 90 n1.setCoor(new LatLon(1,1)); 85 model.populate(n1, n2);91 populate(n1, n2); 86 92 assertTrue(model.hasCoordConflict()); 87 93 … … 89 95 n1.cloneFrom(new Node(1)); 90 96 n2.setCoor(new LatLon(2,2)); 91 model.populate(n1, n2);97 populate(n1, n2); 92 98 assertTrue(model.hasCoordConflict()); 93 99 94 100 n1.setCoor(new LatLon(1,1)); 95 101 n2.setCoor(new LatLon(2,2)); 96 model.populate(n1, n2);102 populate(n1, n2); 97 103 assertTrue(model.hasCoordConflict()); 98 104
Note:
See TracChangeset
for help on using the changeset viewer.