From f54075f5222e0222aa666e214d133dd28e21df1d Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Wed, 16 Nov 2022 23:02:34 +0100 Subject: [PATCH 1/3] Add circularize selected ways unit test --- test/data/alignCircleBuildingsAfter.osm | 69 +++++++++++++++++++ test/data/alignCircleBuildingsBefore.osm | 69 +++++++++++++++++++ .../josm/actions/AlignInCircleActionTest.java | 64 +++++++++++++++++ 3 files changed, 202 insertions(+) create mode 100644 test/data/alignCircleBuildingsAfter.osm create mode 100644 test/data/alignCircleBuildingsBefore.osm diff --git a/test/data/alignCircleBuildingsAfter.osm b/test/data/alignCircleBuildingsAfter.osm new file mode 100644 index 0000000000..16b8bfc149 --- /dev/null +++ b/test/data/alignCircleBuildingsAfter.osm @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/data/alignCircleBuildingsBefore.osm b/test/data/alignCircleBuildingsBefore.osm new file mode 100644 index 0000000000..d10e42839c --- /dev/null +++ b/test/data/alignCircleBuildingsBefore.osm @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java b/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java index 5f33504bbb..1643bb4568 100644 --- a/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java +++ b/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java @@ -181,4 +181,68 @@ final class AlignInCircleActionTest { } } } + + /** + * Test case: Circularize a batch of (two) buildings. + * @throws Exception if an error occurs + */ + @Test + void testMultipleWaysSelected() throws Exception + { + DataSet before = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBuildingsBefore.osm")), null); + Way firstBefore = null; + Way secondBefore = null; + + for (Way w : before.getWays()) { + if ("first".equals(w.get("test"))) { + firstBefore = w; + } else if ("second".equals(w.get("test"))) { + secondBefore = w; + } else { + assertTrue(false); // must not be possible + } + } + + assertNotNull(firstBefore); + assertNotNull(secondBefore); + + before.clearSelection(); + before.addSelected(firstBefore); + before.addSelected(secondBefore); + + Command c = AlignInCircleAction.buildCommand(before); + c.executeCommand(); + + DataSet after = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBuildingsAfter.osm")), null); + Way firstAfter = null; + Way secondAfter = null; + + for (Way w : after.getWays()) { + if ("first".equals(w.get("test"))) { + firstAfter = w; + } else if ("second".equals(w.get("test"))) { + secondAfter = w; + } else { + assertTrue(false); // must not be possible + } + } + + assertNotNull(firstAfter); + assertEquals(firstAfter.getNodesCount(), firstBefore.getNodesCount()); + for (int i = 0; i < firstAfter.getNodesCount(); i++) { + Node bn = firstBefore.getNode(i); + Node an = firstAfter.getNode(i); + assertEquals(bn.lat(), an.lat(), 1e-5); + assertEquals(bn.lon(), an.lon(), 1e-5); + } + + assertNotNull(secondAfter); + assertEquals(secondAfter.getNodesCount(), secondBefore.getNodesCount()); + for (int i = 0; i < secondAfter.getNodesCount(); i++) { + Node bn = secondBefore.getNode(i); + Node an = secondAfter.getNode(i); + assertEquals(bn.lat(), an.lat(), 1e-5); + assertEquals(bn.lon(), an.lon(), 1e-5); + } + } } -- 2.30.2