Index: trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/AddCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -34,4 +35,8 @@ .withPrefabValues(OsmPrimitive.class, new Node(1), new Node(2)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ChangeCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -32,4 +33,8 @@ public void equalsContract() { EqualsVerifier.forClass(ChangeCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmPrimitive.class, new Node(1), new Node(2)) Index: trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ChangeNodesCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -33,4 +34,8 @@ .withPrefabValues(Way.class, new Way(1), new Way(2)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(ChangePropertyCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ChangePropertyKeyCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(ChangePropertyKeyCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommandTest.java (revision 9943) @@ -7,4 +7,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -33,4 +34,8 @@ .withPrefabValues(Relation.class, new Relation(1), new Relation(2)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(Command.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(DeleteCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/MoveCommandTest.java (revision 9943) @@ -5,5 +5,7 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +32,10 @@ public void equalsContract() { EqualsVerifier.forClass(MoveCommand.class).usingGetClass() + .withPrefabValues(LatLon.class, + LatLon.ZERO, new LatLon(45, 45)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java (revision 9943) @@ -5,8 +5,11 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.conflict.Conflict; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Hash; +import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Storage; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +38,9 @@ .withPrefabValues(DataSet.class, new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) + .withPrefabValues(Conflict.class, + new Conflict<>(new Node(1, 1), new Node(2, 1)), + new Conflict<>(new Node(1, 1), new Node(3, 1))) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/RemoveNodesCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -33,4 +34,8 @@ .withPrefabValues(Way.class, new Way(1), new Way(2)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/RotateCommandTest.java (revision 9943) @@ -5,5 +5,7 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +32,10 @@ public void equalsContract() { EqualsVerifier.forClass(RotateCommand.class).usingGetClass() + .withPrefabValues(LatLon.class, + LatLon.ZERO, new LatLon(45, 45)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/ScaleCommandTest.java (revision 9943) @@ -5,5 +5,7 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +32,10 @@ public void equalsContract() { EqualsVerifier.forClass(ScaleCommand.class).usingGetClass() + .withPrefabValues(LatLon.class, + LatLon.ZERO, new LatLon(45, 45)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (revision 9943) @@ -6,4 +6,5 @@ import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +31,8 @@ public void equalsContract() { EqualsVerifier.forClass(SelectCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java (revision 9943) @@ -7,4 +7,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -33,4 +34,8 @@ .withPrefabValues(Command.class, new AddCommand(new Node(1)), new AddCommand(new Node(2))) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/TransformNodesCommandTest.java (revision 9943) @@ -5,5 +5,7 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +32,10 @@ public void equalsContract() { EqualsVerifier.forClass(TransformNodesCommand.class).usingGetClass() + .withPrefabValues(LatLon.class, + LatLon.ZERO, new LatLon(45, 45)) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (revision 9943) @@ -14,4 +14,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -77,4 +78,8 @@ public void equalsContract() { EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass() + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java (revision 9943) @@ -5,5 +5,8 @@ import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.data.conflict.Conflict; import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -30,4 +33,11 @@ public void equalsContract() { EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass() + .withPrefabValues(Conflict.class, + new Conflict<>(new Node(1, 1), new Node(2, 1)), + new Conflict<>(new Node(1, 1), new Node(3, 1))) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (revision 9943) @@ -15,4 +15,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType; @@ -94,4 +95,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +36,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/ModifiedConflictResolveCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +36,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommandTest.java (revision 9943) @@ -9,4 +9,5 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -37,4 +38,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Relation(), new Relation())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +36,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +36,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommandTest.java (revision 9943) @@ -8,4 +8,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.User; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; @@ -35,4 +36,8 @@ .withPrefabValues(Conflict.class, new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way())) + .withPrefabValues(DataSet.class, + new DataSet(), new DataSet()) + .withPrefabValues(User.class, + User.createOsmUser(1, "foo"), User.createOsmUser(2, "bar")) .withPrefabValues(OsmDataLayer.class, new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null)) Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 9942) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PrefEntryTest.java (revision 9943) @@ -55,5 +55,7 @@ @Test public void equalsContract() { - EqualsVerifier.forClass(PrefEntry.class).usingGetClass().verify(); + EqualsVerifier.forClass(PrefEntry.class).usingGetClass() + .withIgnoredFields("value", "defaultValue", "isDefault", "changed") + .verify(); } }