From e03241cc06f1a367e1840d30d73595673b4d063d Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Sat, 21 Sep 2019 07:48:33 -0600 Subject: [PATCH] Fix code duplication issues Signed-off-by: Taylor Smock --- .../plugins/rapid/RapiDAddComandTest.java | 53 ++++++++----------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/test/unit/org/openstreetmap/josm/plugins/rapid/RapiDAddComandTest.java b/test/unit/org/openstreetmap/josm/plugins/rapid/RapiDAddComandTest.java index 96deef4..d5d02cb 100644 --- a/test/unit/org/openstreetmap/josm/plugins/rapid/RapiDAddComandTest.java +++ b/test/unit/org/openstreetmap/josm/plugins/rapid/RapiDAddComandTest.java @@ -20,41 +20,22 @@ public class RapiDAddComandTest { public JOSMTestRules test = new JOSMTestRules(); @Test - public void testMoveCollectionSingleParent() { - DataSet ds1 = new DataSet(); - DataSet ds2 = new DataSet(); - Way way1 = TestUtils.newWay("highway=residential", new Node(new LatLon(0, 0)), - new Node(new LatLon(0, 0.1))); - for (Node node : way1.getNodes()) { - ds1.addPrimitive(node); - } - ds1.addPrimitive(way1); - ds1.lock(); - RapiDAddCommand command = new RapiDAddCommand(ds1, ds2, Collections.singleton(way1)); - command.executeCommand(); - Assert.assertTrue(ds2.containsWay(way1)); - Assert.assertTrue(ds2.containsNode(way1.firstNode())); - Assert.assertTrue(ds2.containsNode(way1.lastNode())); - Assert.assertFalse(ds1.containsWay(way1)); - } - - @Test - public void testMoveCollectionMultipleParent() { - + public void testMoveCollection() { DataSet ds1 = new DataSet(); DataSet ds2 = new DataSet(); Way way1 = TestUtils.newWay("highway=residential", new Node(new LatLon(0, 0)), new Node(new LatLon(0, 0.1))); Way way2 = TestUtils.newWay("highway=residential", new Node(new LatLon(-0.1, -0.2)), way1.firstNode()); - for (Node node : way1.getNodes()) { - ds1.addPrimitive(node); - } - for (Node node : way2.getNodes()) { - if (!ds1.containsNode(node)) { - ds1.addPrimitive(node); + Way way3 = TestUtils.newWay("highway=residential", new Node(new LatLon(65, 65)), new Node(new LatLon(66, 66))); + for (Way way : Arrays.asList(way1, way2, way3)) { + for (Node node : way.getNodes()) { + if (!ds1.containsNode(node)) { + ds1.addPrimitive(node); + } + } + if (!ds1.containsWay(way)) { + ds1.addPrimitive(way); } } - ds1.addPrimitive(way1); - ds1.addPrimitive(way2); ds1.lock(); RapiDAddCommand command = new RapiDAddCommand(ds1, ds2, Arrays.asList(way1, way2)); command.executeCommand(); @@ -62,12 +43,24 @@ public class RapiDAddComandTest { Assert.assertTrue(ds2.containsNode(way1.firstNode())); Assert.assertTrue(ds2.containsNode(way1.lastNode())); Assert.assertFalse(ds1.containsWay(way1)); + Assert.assertTrue(ds2.containsWay(way2)); + Assert.assertTrue(ds2.containsNode(way2.firstNode())); + Assert.assertTrue(ds2.containsNode(way2.lastNode())); + Assert.assertFalse(ds1.containsWay(way2)); + + Assert.assertFalse(ds2.containsWay(way3)); + command = new RapiDAddCommand(ds1, ds2, Arrays.asList(way3)); + command.executeCommand(); + Assert.assertTrue(ds2.containsWay(way3)); + Assert.assertTrue(ds2.containsNode(way3.firstNode())); + Assert.assertTrue(ds2.containsNode(way3.lastNode())); + Assert.assertFalse(ds1.containsWay(way3)); } @Test public void testCreateConnections() { DataSet ds1 = new DataSet(); - Way way1 = TestUtils.newWay("highway=residential", new Node(new LatLon(0, 0)), new Node(new LatLon(0, 0.1))); + Way way1 = TestUtils.newWay("highway=residential", new Node(new LatLon(0, 0)), new Node(new LatLon(0, 0.15))); Way way2 = TestUtils.newWay("highway=residential", new Node(new LatLon(0, 0.05)), new Node(new LatLon(0.05, 0.2))); way2.firstNode().put("conn",