Changeset 9943 in josm for trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
- Timestamp:
- 2016-03-06T23:01:19+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
r9671 r9943 15 15 import org.openstreetmap.josm.data.osm.DataSet; 16 16 import org.openstreetmap.josm.data.osm.Node; 17 import org.openstreetmap.josm.data.osm.User; 17 18 import org.openstreetmap.josm.data.osm.Way; 18 19 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType; … … 94 95 .withPrefabValues(Conflict.class, 95 96 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 97 .withPrefabValues(DataSet.class, 98 new DataSet(), new DataSet()) 99 .withPrefabValues(User.class, 100 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 96 101 .withPrefabValues(OsmDataLayer.class, 97 102 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null))
Note:
See TracChangeset
for help on using the changeset viewer.