Changeset 9943 in josm for trunk/test
- Timestamp:
- 2016-03-06T23:01:19+01:00 (9 years ago)
- Location:
- trunk/test
- Files:
-
- 1 added
- 1 deleted
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java
r9761 r9943 8 8 import org.openstreetmap.josm.data.osm.Node; 9 9 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 11 12 … … 34 35 .withPrefabValues(OsmPrimitive.class, 35 36 new Node(1), new Node(2)) 37 .withPrefabValues(DataSet.class, 38 new DataSet(), new DataSet()) 39 .withPrefabValues(User.class, 40 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 36 41 .withPrefabValues(OsmDataLayer.class, 37 42 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java
r9761 r9943 8 8 import org.openstreetmap.josm.data.osm.Node; 9 9 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 11 12 … … 32 33 public void equalsContract() { 33 34 EqualsVerifier.forClass(ChangeCommand.class).usingGetClass() 35 .withPrefabValues(DataSet.class, 36 new DataSet(), new DataSet()) 37 .withPrefabValues(User.class, 38 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 34 39 .withPrefabValues(OsmPrimitive.class, 35 40 new Node(1), new Node(2)) -
trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.data.osm.Way; 9 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 33 34 .withPrefabValues(Way.class, 34 35 new Way(1), new Way(2)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 35 40 .withPrefabValues(OsmDataLayer.class, 36 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java
r9761 r9943 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 8 import org.openstreetmap.josm.data.osm.Relation; 9 import org.openstreetmap.josm.data.osm.User; 9 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 10 11 … … 33 34 .withPrefabValues(Relation.class, 34 35 new Relation(1), new Relation(2)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 35 40 .withPrefabValues(OsmDataLayer.class, 36 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(Command.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(DeleteCommand.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.coor.LatLon; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 9 import org.openstreetmap.josm.data.osm.User; 8 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 11 … … 30 32 public void equalsContract() { 31 33 EqualsVerifier.forClass(MoveCommand.class).usingGetClass() 34 .withPrefabValues(LatLon.class, 35 LatLon.ZERO, new LatLon(45, 45)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 40 .withPrefabValues(OsmDataLayer.class, 33 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.conflict.Conflict; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 8 9 import org.openstreetmap.josm.data.osm.Hash; 10 import org.openstreetmap.josm.data.osm.Node; 9 11 import org.openstreetmap.josm.data.osm.OsmPrimitive; 10 12 import org.openstreetmap.josm.data.osm.Storage; 13 import org.openstreetmap.josm.data.osm.User; 11 14 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 15 … … 35 38 .withPrefabValues(DataSet.class, 36 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 42 .withPrefabValues(Conflict.class, 43 new Conflict<>(new Node(1, 1), new Node(2, 1)), 44 new Conflict<>(new Node(1, 1), new Node(3, 1))) 37 45 .withPrefabValues(OsmDataLayer.class, 38 46 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java
r9666 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.data.osm.Way; 9 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 33 34 .withPrefabValues(Way.class, 34 35 new Way(1), new Way(2)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 35 40 .withPrefabValues(OsmDataLayer.class, 36 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.coor.LatLon; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 9 import org.openstreetmap.josm.data.osm.User; 8 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 11 … … 30 32 public void equalsContract() { 31 33 EqualsVerifier.forClass(RotateCommand.class).usingGetClass() 34 .withPrefabValues(LatLon.class, 35 LatLon.ZERO, new LatLon(45, 45)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 40 .withPrefabValues(OsmDataLayer.class, 33 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.coor.LatLon; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 9 import org.openstreetmap.josm.data.osm.User; 8 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 11 … … 30 32 public void equalsContract() { 31 33 EqualsVerifier.forClass(ScaleCommand.class).usingGetClass() 34 .withPrefabValues(LatLon.class, 35 LatLon.ZERO, new LatLon(45, 45)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 40 .withPrefabValues(OsmDataLayer.class, 33 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java
r9761 r9943 6 6 import org.openstreetmap.josm.JOSMFixture; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.data.osm.User; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 … … 30 31 public void equalsContract() { 31 32 EqualsVerifier.forClass(SelectCommand.class).usingGetClass() 33 .withPrefabValues(DataSet.class, 34 new DataSet(), new DataSet()) 35 .withPrefabValues(User.class, 36 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 37 .withPrefabValues(OsmDataLayer.class, 33 38 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
r9761 r9943 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 8 import org.openstreetmap.josm.data.osm.Node; 9 import org.openstreetmap.josm.data.osm.User; 9 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 10 11 … … 33 34 .withPrefabValues(Command.class, 34 35 new AddCommand(new Node(1)), new AddCommand(new Node(2))) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 35 40 .withPrefabValues(OsmDataLayer.class, 36 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.coor.LatLon; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 9 import org.openstreetmap.josm.data.osm.User; 8 10 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 11 … … 30 32 public void equalsContract() { 31 33 EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass() 34 .withPrefabValues(LatLon.class, 35 LatLon.ZERO, new LatLon(45, 45)) 36 .withPrefabValues(DataSet.class, 37 new DataSet(), new DataSet()) 38 .withPrefabValues(User.class, 39 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 40 .withPrefabValues(OsmDataLayer.class, 33 41 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
r9671 r9943 14 14 import org.openstreetmap.josm.data.osm.DataSet; 15 15 import org.openstreetmap.josm.data.osm.Node; 16 import org.openstreetmap.josm.data.osm.User; 16 17 import org.openstreetmap.josm.data.osm.Way; 17 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 77 78 public void equalsContract() { 78 79 EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass() 80 .withPrefabValues(DataSet.class, 81 new DataSet(), new DataSet()) 82 .withPrefabValues(User.class, 83 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 79 84 .withPrefabValues(Conflict.class, 80 85 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java
r9761 r9943 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.JOSMFixture; 7 import org.openstreetmap.josm.data.conflict.Conflict; 7 8 import org.openstreetmap.josm.data.osm.DataSet; 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 8 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 12 … … 30 33 public void equalsContract() { 31 34 EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass() 35 .withPrefabValues(Conflict.class, 36 new Conflict<>(new Node(1, 1), new Node(2, 1)), 37 new Conflict<>(new Node(1, 1), new Node(3, 1))) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 32 42 .withPrefabValues(OsmDataLayer.class, 33 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
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)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java
r9666 r9943 8 8 import org.openstreetmap.josm.data.osm.DataSet; 9 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.data.osm.Way; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 35 36 .withPrefabValues(Conflict.class, 36 37 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 37 42 .withPrefabValues(OsmDataLayer.class, 38 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java
r9666 r9943 8 8 import org.openstreetmap.josm.data.osm.DataSet; 9 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.data.osm.Way; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 35 36 .withPrefabValues(Conflict.class, 36 37 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 37 42 .withPrefabValues(OsmDataLayer.class, 38 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java
r9666 r9943 9 9 import org.openstreetmap.josm.data.osm.Node; 10 10 import org.openstreetmap.josm.data.osm.Relation; 11 import org.openstreetmap.josm.data.osm.User; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 13 … … 37 38 .withPrefabValues(Conflict.class, 38 39 new Conflict<>(new Node(), new Node()), new Conflict<>(new Relation(), new Relation())) 40 .withPrefabValues(DataSet.class, 41 new DataSet(), new DataSet()) 42 .withPrefabValues(User.class, 43 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 39 44 .withPrefabValues(OsmDataLayer.class, 40 45 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java
r9666 r9943 8 8 import org.openstreetmap.josm.data.osm.DataSet; 9 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.data.osm.Way; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 35 36 .withPrefabValues(Conflict.class, 36 37 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 37 42 .withPrefabValues(OsmDataLayer.class, 38 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java
r9666 r9943 8 8 import org.openstreetmap.josm.data.osm.DataSet; 9 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.data.osm.Way; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 35 36 .withPrefabValues(Conflict.class, 36 37 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 37 42 .withPrefabValues(OsmDataLayer.class, 38 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java
r9666 r9943 8 8 import org.openstreetmap.josm.data.osm.DataSet; 9 9 import org.openstreetmap.josm.data.osm.Node; 10 import org.openstreetmap.josm.data.osm.User; 10 11 import org.openstreetmap.josm.data.osm.Way; 11 12 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 35 36 .withPrefabValues(Conflict.class, 36 37 new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) 38 .withPrefabValues(DataSet.class, 39 new DataSet(), new DataSet()) 40 .withPrefabValues(User.class, 41 User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) 37 42 .withPrefabValues(OsmDataLayer.class, 38 43 new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java
r9906 r9943 55 55 @Test 56 56 public void equalsContract() { 57 EqualsVerifier.forClass(PrefEntry.class).usingGetClass().verify(); 57 EqualsVerifier.forClass(PrefEntry.class).usingGetClass() 58 .withIgnoredFields("value", "defaultValue", "isDefault", "changed") 59 .verify(); 58 60 } 59 61 }
Note:
See TracChangeset
for help on using the changeset viewer.