From 38f8cf500fdb1a9f767fa040c7c85a84d0ea049e Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Thu, 15 Aug 2024 13:04:34 -0400 Subject: [PATCH 1/5] Unit tests: Improve build time - Remove unnecessary includes from tut.hpp - Add tut.hpp to precompiled headers Improves test build time from 4:30 to 3:20 on my system. --- tests/unit/CMakeLists.txt | 8 ++++++++ tests/unit/capi/GEOSCoordSeqTest.cpp | 1 + tests/unit/capi/GEOSDistanceTest.cpp | 3 +-- tests/unit/geom/CoordinateSequenceIteratorTest.cpp | 2 +- tests/unit/tut/tut.hpp | 8 ++------ tests/unit/tut/tut_assert.hpp | 1 + tests/unit/tut/tut_console_reporter.hpp | 1 + 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index f7c302de6b..855641ed37 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -20,6 +20,14 @@ target_include_directories(test_geos_unit PRIVATE $) +# Precompile TUT when using gcc +# Some clang and MSVC CI configurations complain about the combination of +# PCH and -O1 +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.16") + target_precompile_headers(test_geos_unit PRIVATE + "$<$:${CMAKE_CURRENT_LIST_DIR}/tut/tut.hpp>") +endif() + file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/**/*Test.cpp CONFIGURE_DEPEND) foreach(_testfile ${_testfiles}) string(REPLACE ${CMAKE_CURRENT_LIST_DIR}/ "" _testname ${_testfile}) diff --git a/tests/unit/capi/GEOSCoordSeqTest.cpp b/tests/unit/capi/GEOSCoordSeqTest.cpp index 03feb3efa3..60f5a83038 100644 --- a/tests/unit/capi/GEOSCoordSeqTest.cpp +++ b/tests/unit/capi/GEOSCoordSeqTest.cpp @@ -5,6 +5,7 @@ // geos #include // std +#include #include #include #include diff --git a/tests/unit/capi/GEOSDistanceTest.cpp b/tests/unit/capi/GEOSDistanceTest.cpp index 0416532ef4..f5f5e14715 100644 --- a/tests/unit/capi/GEOSDistanceTest.cpp +++ b/tests/unit/capi/GEOSDistanceTest.cpp @@ -6,11 +6,10 @@ #include #include // std -#include +#include #include #include #include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/geom/CoordinateSequenceIteratorTest.cpp b/tests/unit/geom/CoordinateSequenceIteratorTest.cpp index 7fa8463356..ca98b8172a 100644 --- a/tests/unit/geom/CoordinateSequenceIteratorTest.cpp +++ b/tests/unit/geom/CoordinateSequenceIteratorTest.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include namespace tut { diff --git a/tests/unit/tut/tut.hpp b/tests/unit/tut/tut.hpp index f8d4648196..ea7104c24b 100644 --- a/tests/unit/tut/tut.hpp +++ b/tests/unit/tut/tut.hpp @@ -4,14 +4,10 @@ #undef public #undef private -#include +#include #include -#include -#include #include -#include -#include -#include + #include "tut_exception.hpp" #include "tut_result.hpp" diff --git a/tests/unit/tut/tut_assert.hpp b/tests/unit/tut/tut_assert.hpp index faf10b874f..506192c4c8 100644 --- a/tests/unit/tut/tut_assert.hpp +++ b/tests/unit/tut/tut_assert.hpp @@ -7,6 +7,7 @@ #include #include #include +#include #if defined(TUT_USE_POSIX) #include diff --git a/tests/unit/tut/tut_console_reporter.hpp b/tests/unit/tut/tut_console_reporter.hpp index c30459e062..bc06fd12bd 100644 --- a/tests/unit/tut/tut_console_reporter.hpp +++ b/tests/unit/tut/tut_console_reporter.hpp @@ -1,6 +1,7 @@ #ifndef TUT_CONSOLE_REPORTER #define TUT_CONSOLE_REPORTER #include +#include #include #if defined(TUT_USE_POSIX) From a1c831309de8f55cad840ce466ade52e19cd685c Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Thu, 15 Aug 2024 13:40:35 -0400 Subject: [PATCH 2/5] GeoJSONWriterTest: Fix -Werror=array-bounds --- tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp | 42 +++++----- tests/unit/io/GeoJSONWriterTest.cpp | 84 ++++++++++---------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp b/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp index 23b2d68d1e..b5861b4d14 100644 --- a/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp +++ b/tests/unit/capi/GEOSGeomGeoJSONWriteTest.cpp @@ -77,27 +77,27 @@ void object::test<3> () { std::string wkt("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)"); - std::string expected(std::string{"{\n"} + - " \"type\": \"LineString\",\n" + - " \"coordinates\": [\n" + - " [\n" + - " 102.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 103.0,\n" + - " 1.0\n" + - " ],\n" + - " [\n" + - " 104.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 105.0,\n" + - " 1.0\n" + - " ]\n" + - " ]\n" + - "}"); + std::string expected(std::string{"{\n" + " \"type\": \"LineString\",\n" + " \"coordinates\": [\n" + " [\n" + " 102.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 103.0,\n" + " 1.0\n" + " ],\n" + " [\n" + " 104.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 105.0,\n" + " 1.0\n" + " ]\n" + " ]\n" + "}"}); test_geojson(wkt, expected, 4); } diff --git a/tests/unit/io/GeoJSONWriterTest.cpp b/tests/unit/io/GeoJSONWriterTest.cpp index 26a2d85204..684fb916cc 100644 --- a/tests/unit/io/GeoJSONWriterTest.cpp +++ b/tests/unit/io/GeoJSONWriterTest.cpp @@ -163,27 +163,27 @@ void object::test<11> { GeomPtr geom(wktreader.read("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)")); std::string result = geojsonwriter.writeFormatted(geom.get()); - ensure_equals(result, std::string{"{\n"} + - " \"type\": \"LineString\",\n" + - " \"coordinates\": [\n" + - " [\n" + - " 102.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 103.0,\n" + - " 1.0\n" + - " ],\n" + - " [\n" + - " 104.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 105.0,\n" + - " 1.0\n" + - " ]\n" + - " ]\n" + - "}"); + ensure_equals(result, std::string{"{\n" + " \"type\": \"LineString\",\n" + " \"coordinates\": [\n" + " [\n" + " 102.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 103.0,\n" + " 1.0\n" + " ],\n" + " [\n" + " 104.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 105.0,\n" + " 1.0\n" + " ]\n" + " ]\n" + "}"}); } // Write a LineString to formatted GeoJSON with custom indentation @@ -194,27 +194,27 @@ void object::test<12> { GeomPtr geom(wktreader.read("LINESTRING(102.0 0.0, 103.0 1.0, 104.0 0.0, 105.0 1.0)")); std::string result = geojsonwriter.writeFormatted(geom.get(), geos::io::GeoJSONType::GEOMETRY, 2); - ensure_equals(result, std::string{"{\n"} + - " \"type\": \"LineString\",\n" + - " \"coordinates\": [\n" + - " [\n" + - " 102.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 103.0,\n" + - " 1.0\n" + - " ],\n" + - " [\n" + - " 104.0,\n" + - " 0.0\n" + - " ],\n" + - " [\n" + - " 105.0,\n" + - " 1.0\n" + - " ]\n" + - " ]\n" + - "}"); + ensure_equals(result, std::string{"{\n" + " \"type\": \"LineString\",\n" + " \"coordinates\": [\n" + " [\n" + " 102.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 103.0,\n" + " 1.0\n" + " ],\n" + " [\n" + " 104.0,\n" + " 0.0\n" + " ],\n" + " [\n" + " 105.0,\n" + " 1.0\n" + " ]\n" + " ]\n" + "}"}); } // Write a Feature From 38f6a5a23e4f3c76ff4ff8dde83cde9b8316c837 Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Thu, 15 Aug 2024 13:41:26 -0400 Subject: [PATCH 3/5] Unit tests: Remove unnecessary includes --- tests/unit/algorithm/AngleTest.cpp | 2 -- tests/unit/algorithm/AreaTest.cpp | 1 - tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp | 1 - tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp | 1 - tests/unit/algorithm/CentroidTest.cpp | 1 - tests/unit/algorithm/ConvexHullTest.cpp | 1 - tests/unit/algorithm/InteriorPointAreaTest.cpp | 1 - tests/unit/algorithm/IntersectionTest.cpp | 2 -- tests/unit/algorithm/LengthTest.cpp | 1 - tests/unit/algorithm/LocatePointInRingTest.cpp | 1 - tests/unit/algorithm/MinimumAreaRectangleTest.cpp | 1 - tests/unit/algorithm/MinimumBoundingCircleTest.cpp | 1 - tests/unit/algorithm/MinimumDiameterTest.cpp | 1 - tests/unit/algorithm/OrientationIndexFailureTest.cpp | 3 --- tests/unit/algorithm/PointLocationTest.cpp | 1 - tests/unit/algorithm/PointLocatorTest.cpp | 1 - tests/unit/algorithm/PolygonNodeTopologyTest.cpp | 1 - tests/unit/algorithm/RobustLineIntersectionTest.cpp | 1 - tests/unit/algorithm/RobustLineIntersectorZTest.cpp | 3 --- tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp | 1 - .../algorithm/construct/MaximumInscribedCircleTest.cpp | 1 - .../algorithm/distance/DiscreteFrechetDistanceTest.cpp | 1 - .../algorithm/distance/DiscreteHausdorffDistanceTest.cpp | 1 - tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp | 1 - tests/unit/algorithm/hull/ConcaveHullTest.cpp | 1 - .../algorithm/locate/IndexedPointInAreaLocatorTest.cpp | 2 -- tests/unit/capi/GEOSBufferTest.cpp | 4 ---- tests/unit/capi/GEOSBuildAreaTest.cpp | 4 ---- tests/unit/capi/GEOSCAPIDefinesTest.cpp | 4 ---- tests/unit/capi/GEOSClipByRectTest.cpp | 2 -- tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp | 3 --- tests/unit/capi/GEOSConcaveHullTest.cpp | 3 --- .../unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp | 4 ---- tests/unit/capi/GEOSContainsTest.cpp | 3 --- tests/unit/capi/GEOSConvexHullTest.cpp | 3 --- tests/unit/capi/GEOSCoordSeqTest.cpp | 2 -- tests/unit/capi/GEOSCoverageIsValidTest.cpp | 5 ----- tests/unit/capi/GEOSCoverageSimplifyTest.cpp | 5 ----- tests/unit/capi/GEOSCoverageUnionTest.cpp | 5 ----- tests/unit/capi/GEOSDelaunayTriangulationTest.cpp | 5 ----- tests/unit/capi/GEOSDistanceWithinTest.cpp | 7 ------- tests/unit/capi/GEOSEqualsTest.cpp | 3 --- tests/unit/capi/GEOSFrechetDistanceTest.cpp | 6 ------ tests/unit/capi/GEOSGeomToWKBTest.cpp | 2 -- tests/unit/capi/GEOSGeomToWKTTest.cpp | 3 --- tests/unit/capi/GEOSGeom_cloneTest.cpp | 4 ---- tests/unit/capi/GEOSGeom_createCollectionTest.cpp | 3 --- tests/unit/capi/GEOSGeom_createRectangleTest.cpp | 4 ---- tests/unit/capi/GEOSGeom_createTest.cpp | 3 --- tests/unit/capi/GEOSGeom_extentTest.cpp | 4 ---- tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp | 4 ---- tests/unit/capi/GEOSGeom_transformXYTest.cpp | 4 ---- tests/unit/capi/GEOSGetCentroidTest.cpp | 5 ----- tests/unit/capi/GEOSHausdorffDistanceTest.cpp | 6 ------ tests/unit/capi/GEOSHilbertCodeTest.cpp | 4 ---- tests/unit/capi/GEOSInterruptTest.cpp | 5 ----- tests/unit/capi/GEOSIntersectionPrecTest.cpp | 4 ---- tests/unit/capi/GEOSIntersectsTest.cpp | 3 --- tests/unit/capi/GEOSLargestEmptyCircleTest.cpp | 5 ----- tests/unit/capi/GEOSLineMergeDirectedTest.cpp | 3 --- tests/unit/capi/GEOSLineMergeTest.cpp | 3 --- tests/unit/capi/GEOSLineStringTest.cpp | 3 --- tests/unit/capi/GEOSLineSubstringTest.cpp | 3 --- tests/unit/capi/GEOSMakeValidTest.cpp | 4 ---- tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp | 5 ----- tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp | 1 - tests/unit/capi/GEOSMinimumClearanceTest.cpp | 4 ---- tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp | 4 ---- tests/unit/capi/GEOSMinimumWidthTest.cpp | 4 ---- tests/unit/capi/GEOSNearestPointsTest.cpp | 4 ---- tests/unit/capi/GEOSNodeTest.cpp | 5 ----- tests/unit/capi/GEOSOffsetCurveTest.cpp | 1 - tests/unit/capi/GEOSOrientPolygonsTest.cpp | 6 ------ tests/unit/capi/GEOSOrientationIndexTest.cpp | 6 ------ tests/unit/capi/GEOSPointOnSurfaceTest.cpp | 5 ----- tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp | 4 ---- tests/unit/capi/GEOSPolygonizeTest.cpp | 5 ----- tests/unit/capi/GEOSPreparedDistanceTest.cpp | 4 ---- tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp | 4 ---- tests/unit/capi/GEOSPreparedGeometryTest.cpp | 3 --- tests/unit/capi/GEOSPreparedNearestPointsTest.cpp | 4 ---- tests/unit/capi/GEOSProjectTest.cpp | 5 ----- tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp | 4 ---- tests/unit/capi/GEOSRelatePatternMatchTest.cpp | 4 +--- tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp | 6 ------ tests/unit/capi/GEOSReverseTest.cpp | 4 ---- tests/unit/capi/GEOSSTRtreeTest.cpp | 1 - tests/unit/capi/GEOSSegmentIntersectionTest.cpp | 4 ---- tests/unit/capi/GEOSSharedPathsTest.cpp | 3 --- tests/unit/capi/GEOSSimplifyTest.cpp | 5 ----- tests/unit/capi/GEOSSnapTest.cpp | 3 --- tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp | 5 ----- tests/unit/capi/GEOSUnaryUnionPrecTest.cpp | 5 ----- tests/unit/capi/GEOSUnaryUnionTest.cpp | 3 --- tests/unit/capi/GEOSUserDataTest.cpp | 7 +------ tests/unit/capi/GEOSVoronoiDiagramTest.cpp | 4 ---- tests/unit/capi/GEOSWithinTest.cpp | 4 ---- tests/unit/capi/GEOSisClosedTest.cpp | 6 ------ tests/unit/capi/GEOSisRingTest.cpp | 6 ------ tests/unit/capi/GEOSisValidDetailTest.cpp | 4 ---- tests/unit/capi/capi_test_utils.h | 2 -- tests/unit/geomgraph/TopologyLocationTest.cpp | 4 ---- tests/unit/index/VertexSequencePackedRtreeTest.cpp | 3 --- tests/unit/index/strtree/SimpleSTRtreeTest.cpp | 2 -- tests/unit/index/strtree/TemplateSTRtreeTest.cpp | 2 -- tests/unit/io/ByteOrderValuesTest.cpp | 3 --- tests/unit/io/GeoJSONFeatureTest.cpp | 1 - tests/unit/io/GeoJSONReaderTest.cpp | 1 - tests/unit/io/GeoJSONValueTest.cpp | 4 +--- tests/unit/io/WKTWriterTest.cpp | 1 - tests/unit/io/WriterTest.cpp | 2 -- tests/unit/linearref/LengthIndexedLineTest.cpp | 1 - tests/unit/math/DDTest.cpp | 4 ---- tests/unit/noding/NodedSegmentStringTest.cpp | 1 - tests/unit/noding/snapround/HotPixelTest.cpp | 2 -- tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp | 4 ---- tests/unit/operation/BoundaryOpTest.cpp | 2 -- tests/unit/operation/buffer/BufferBuilderTest.cpp | 1 - tests/unit/operation/buffer/BufferOpTest.cpp | 1 - tests/unit/operation/buffer/OffsetCurveTest.cpp | 1 - tests/unit/operation/distance/DistanceOpTest.cpp | 1 - tests/unit/operation/geounion/CoverageUnionTest.cpp | 1 - tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp | 1 - .../unit/operation/overlay/snap/LineStringSnapperTest.cpp | 1 - .../overlay/validate/OverlayResultValidatorTest.cpp | 1 - tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp | 1 - tests/unit/operation/relate/RelateOpTest.cpp | 1 - tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp | 1 - tests/unit/operation/valid/MakeValidTest.cpp | 5 ----- tests/unit/operation/valid/ValidClosedRingTest.cpp | 2 -- .../valid/ValidSelfTouchingRingFormingHoleTest.cpp | 1 - tests/unit/precision/GeometryPrecisionReducerTest.cpp | 2 -- .../unit/precision/SimpleGeometryPrecisionReducerTest.cpp | 1 - tests/unit/triangulate/DelaunayTest.cpp | 2 -- tests/unit/triangulate/VoronoiTest.cpp | 2 +- .../polygon/ConstrainedDelaunayTriangulatorTest.cpp | 3 --- tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp | 3 --- tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp | 3 --- .../unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp | 3 +-- tests/unit/triangulate/quadedge/QuadEdgeTest.cpp | 2 -- tests/unit/triangulate/quadedge/VertexTest.cpp | 2 -- 141 files changed, 5 insertions(+), 408 deletions(-) diff --git a/tests/unit/algorithm/AngleTest.cpp b/tests/unit/algorithm/AngleTest.cpp index cc889c5e98..4d37671823 100644 --- a/tests/unit/algorithm/AngleTest.cpp +++ b/tests/unit/algorithm/AngleTest.cpp @@ -7,9 +7,7 @@ #include #include // std -#include #include -#include namespace tut { // diff --git a/tests/unit/algorithm/AreaTest.cpp b/tests/unit/algorithm/AreaTest.cpp index 1a81ff08b9..a9fcd1e9e1 100644 --- a/tests/unit/algorithm/AreaTest.cpp +++ b/tests/unit/algorithm/AreaTest.cpp @@ -13,7 +13,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp b/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp index b56e11c16b..8a91fd82b3 100644 --- a/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp +++ b/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp @@ -15,7 +15,6 @@ // std #include #include -#include #include using namespace geos::algorithm; diff --git a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp index e75d614316..b312a01ebd 100644 --- a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp +++ b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp @@ -15,7 +15,6 @@ #include #include #include -#include using namespace geos::algorithm; diff --git a/tests/unit/algorithm/CentroidTest.cpp b/tests/unit/algorithm/CentroidTest.cpp index 152d12dff3..db7d65932e 100644 --- a/tests/unit/algorithm/CentroidTest.cpp +++ b/tests/unit/algorithm/CentroidTest.cpp @@ -12,7 +12,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/ConvexHullTest.cpp b/tests/unit/algorithm/ConvexHullTest.cpp index b265c2216e..c37de5bc8d 100644 --- a/tests/unit/algorithm/ConvexHullTest.cpp +++ b/tests/unit/algorithm/ConvexHullTest.cpp @@ -17,7 +17,6 @@ // std #include #include -#include namespace geos { namespace geom { diff --git a/tests/unit/algorithm/InteriorPointAreaTest.cpp b/tests/unit/algorithm/InteriorPointAreaTest.cpp index 4b30808b65..eacdba30b9 100644 --- a/tests/unit/algorithm/InteriorPointAreaTest.cpp +++ b/tests/unit/algorithm/InteriorPointAreaTest.cpp @@ -23,7 +23,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/IntersectionTest.cpp b/tests/unit/algorithm/IntersectionTest.cpp index b2b6576e27..b3e8f0c938 100644 --- a/tests/unit/algorithm/IntersectionTest.cpp +++ b/tests/unit/algorithm/IntersectionTest.cpp @@ -23,8 +23,6 @@ #include #include // std -#include -#include #include namespace tut { diff --git a/tests/unit/algorithm/LengthTest.cpp b/tests/unit/algorithm/LengthTest.cpp index e70cb87aab..ceee1e634d 100644 --- a/tests/unit/algorithm/LengthTest.cpp +++ b/tests/unit/algorithm/LengthTest.cpp @@ -13,7 +13,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/LocatePointInRingTest.cpp b/tests/unit/algorithm/LocatePointInRingTest.cpp index 0014b1c0d8..f9421032d7 100644 --- a/tests/unit/algorithm/LocatePointInRingTest.cpp +++ b/tests/unit/algorithm/LocatePointInRingTest.cpp @@ -15,7 +15,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/MinimumAreaRectangleTest.cpp b/tests/unit/algorithm/MinimumAreaRectangleTest.cpp index dad9608373..a36723bb83 100644 --- a/tests/unit/algorithm/MinimumAreaRectangleTest.cpp +++ b/tests/unit/algorithm/MinimumAreaRectangleTest.cpp @@ -8,7 +8,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/MinimumBoundingCircleTest.cpp b/tests/unit/algorithm/MinimumBoundingCircleTest.cpp index 599c3e5971..c95f0836ff 100644 --- a/tests/unit/algorithm/MinimumBoundingCircleTest.cpp +++ b/tests/unit/algorithm/MinimumBoundingCircleTest.cpp @@ -25,7 +25,6 @@ #include // std -#include #include #include diff --git a/tests/unit/algorithm/MinimumDiameterTest.cpp b/tests/unit/algorithm/MinimumDiameterTest.cpp index bf36579a38..2f1812b176 100644 --- a/tests/unit/algorithm/MinimumDiameterTest.cpp +++ b/tests/unit/algorithm/MinimumDiameterTest.cpp @@ -23,7 +23,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/OrientationIndexFailureTest.cpp b/tests/unit/algorithm/OrientationIndexFailureTest.cpp index c9419332de..7bd81bbc5d 100644 --- a/tests/unit/algorithm/OrientationIndexFailureTest.cpp +++ b/tests/unit/algorithm/OrientationIndexFailureTest.cpp @@ -7,9 +7,6 @@ #include #include // std -#include -#include -#include using namespace geos::geom; using namespace geos::algorithm; diff --git a/tests/unit/algorithm/PointLocationTest.cpp b/tests/unit/algorithm/PointLocationTest.cpp index bed1a1b0bc..23a87e6133 100644 --- a/tests/unit/algorithm/PointLocationTest.cpp +++ b/tests/unit/algorithm/PointLocationTest.cpp @@ -10,7 +10,6 @@ #include // std -#include #include #include diff --git a/tests/unit/algorithm/PointLocatorTest.cpp b/tests/unit/algorithm/PointLocatorTest.cpp index a230d96864..3cff31ac8a 100644 --- a/tests/unit/algorithm/PointLocatorTest.cpp +++ b/tests/unit/algorithm/PointLocatorTest.cpp @@ -12,7 +12,6 @@ #include // required for use in unique_ptr #include // std -#include #include #include diff --git a/tests/unit/algorithm/PolygonNodeTopologyTest.cpp b/tests/unit/algorithm/PolygonNodeTopologyTest.cpp index 720349164d..3b927e3d8b 100644 --- a/tests/unit/algorithm/PolygonNodeTopologyTest.cpp +++ b/tests/unit/algorithm/PolygonNodeTopologyTest.cpp @@ -9,7 +9,6 @@ #include // std -#include #include #include diff --git a/tests/unit/algorithm/RobustLineIntersectionTest.cpp b/tests/unit/algorithm/RobustLineIntersectionTest.cpp index 595dbd79f3..e515ad0f3e 100644 --- a/tests/unit/algorithm/RobustLineIntersectionTest.cpp +++ b/tests/unit/algorithm/RobustLineIntersectionTest.cpp @@ -11,7 +11,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp index a343102a5e..d57c65b52a 100644 --- a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp +++ b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp @@ -10,9 +10,6 @@ #include #include // std -#include -#include -#include #include diff --git a/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp b/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp index 5a09e2ef88..42d86b66be 100644 --- a/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp +++ b/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp @@ -11,7 +11,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp index be67b9a2e6..ddc0ef9667 100644 --- a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp +++ b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp @@ -15,7 +15,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp index 11fb67aec5..ae5c344c7f 100644 --- a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp +++ b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp @@ -14,7 +14,6 @@ #include // std #include -#include #include #include diff --git a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp index 735344cd59..f50b58680d 100644 --- a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp +++ b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp @@ -14,7 +14,6 @@ #include // std #include -#include #include #include #include diff --git a/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp b/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp index 574e2da385..204f1d692f 100644 --- a/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp +++ b/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp @@ -10,7 +10,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/hull/ConcaveHullTest.cpp b/tests/unit/algorithm/hull/ConcaveHullTest.cpp index 3d47bbc93d..c68961e720 100644 --- a/tests/unit/algorithm/hull/ConcaveHullTest.cpp +++ b/tests/unit/algorithm/hull/ConcaveHullTest.cpp @@ -10,7 +10,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp b/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp index db9cadc56c..1258d65062 100644 --- a/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp +++ b/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp @@ -5,8 +5,6 @@ #include // std -#include -#include #include using geos::geom::CoordinateXY; diff --git a/tests/unit/capi/GEOSBufferTest.cpp b/tests/unit/capi/GEOSBufferTest.cpp index badf30684f..538dfbf75f 100644 --- a/tests/unit/capi/GEOSBufferTest.cpp +++ b/tests/unit/capi/GEOSBufferTest.cpp @@ -5,10 +5,6 @@ // geos #include // std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSBuildAreaTest.cpp b/tests/unit/capi/GEOSBuildAreaTest.cpp index 012de41e40..503003dd63 100644 --- a/tests/unit/capi/GEOSBuildAreaTest.cpp +++ b/tests/unit/capi/GEOSBuildAreaTest.cpp @@ -4,10 +4,6 @@ // geos #include // std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSCAPIDefinesTest.cpp b/tests/unit/capi/GEOSCAPIDefinesTest.cpp index 5d53471287..b86c8fe1c5 100644 --- a/tests/unit/capi/GEOSCAPIDefinesTest.cpp +++ b/tests/unit/capi/GEOSCAPIDefinesTest.cpp @@ -5,10 +5,6 @@ // geos #include // std -#include -#include -#include -#include #define QUOTE(x) #x #define EXPAND_AND_QUOTE(y) QUOTE(y) diff --git a/tests/unit/capi/GEOSClipByRectTest.cpp b/tests/unit/capi/GEOSClipByRectTest.cpp index be47a4c0f7..9ff33d336a 100644 --- a/tests/unit/capi/GEOSClipByRectTest.cpp +++ b/tests/unit/capi/GEOSClipByRectTest.cpp @@ -5,10 +5,8 @@ // geos #include // std -#include #include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp b/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp index 2cd039fb58..751e4cdc40 100644 --- a/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp +++ b/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp @@ -5,9 +5,6 @@ // geos #include // std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSConcaveHullTest.cpp b/tests/unit/capi/GEOSConcaveHullTest.cpp index 243161d31a..5411db1d02 100644 --- a/tests/unit/capi/GEOSConcaveHullTest.cpp +++ b/tests/unit/capi/GEOSConcaveHullTest.cpp @@ -5,9 +5,6 @@ // geos #include // std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp index 2022b7f905..cee6d90198 100644 --- a/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp +++ b/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp @@ -5,10 +5,6 @@ // geos #include // std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSContainsTest.cpp b/tests/unit/capi/GEOSContainsTest.cpp index 2e570424d8..3d377e8295 100644 --- a/tests/unit/capi/GEOSContainsTest.cpp +++ b/tests/unit/capi/GEOSContainsTest.cpp @@ -8,9 +8,6 @@ #include #include // std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSConvexHullTest.cpp b/tests/unit/capi/GEOSConvexHullTest.cpp index e7c20ac0bd..adb679cca8 100644 --- a/tests/unit/capi/GEOSConvexHullTest.cpp +++ b/tests/unit/capi/GEOSConvexHullTest.cpp @@ -5,9 +5,6 @@ // geos #include // std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSCoordSeqTest.cpp b/tests/unit/capi/GEOSCoordSeqTest.cpp index 60f5a83038..bd72d9f13a 100644 --- a/tests/unit/capi/GEOSCoordSeqTest.cpp +++ b/tests/unit/capi/GEOSCoordSeqTest.cpp @@ -6,10 +6,8 @@ #include // std #include -#include #include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSCoverageIsValidTest.cpp b/tests/unit/capi/GEOSCoverageIsValidTest.cpp index 93868959db..8f1e028894 100644 --- a/tests/unit/capi/GEOSCoverageIsValidTest.cpp +++ b/tests/unit/capi/GEOSCoverageIsValidTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSCoverageSimplifyTest.cpp b/tests/unit/capi/GEOSCoverageSimplifyTest.cpp index 812db7cc13..4ca7e9c394 100644 --- a/tests/unit/capi/GEOSCoverageSimplifyTest.cpp +++ b/tests/unit/capi/GEOSCoverageSimplifyTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSCoverageUnionTest.cpp b/tests/unit/capi/GEOSCoverageUnionTest.cpp index 2d7fccc32c..13e9225246 100644 --- a/tests/unit/capi/GEOSCoverageUnionTest.cpp +++ b/tests/unit/capi/GEOSCoverageUnionTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp index 0064d8073d..d685ae25b6 100644 --- a/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp +++ b/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSDistanceWithinTest.cpp b/tests/unit/capi/GEOSDistanceWithinTest.cpp index 567e431925..e64c14b635 100644 --- a/tests/unit/capi/GEOSDistanceWithinTest.cpp +++ b/tests/unit/capi/GEOSDistanceWithinTest.cpp @@ -5,13 +5,6 @@ // geos #include #include -// std -#include -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSEqualsTest.cpp b/tests/unit/capi/GEOSEqualsTest.cpp index 0164a3cede..392e2cd32a 100644 --- a/tests/unit/capi/GEOSEqualsTest.cpp +++ b/tests/unit/capi/GEOSEqualsTest.cpp @@ -6,9 +6,6 @@ #include #include // std -#include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSFrechetDistanceTest.cpp b/tests/unit/capi/GEOSFrechetDistanceTest.cpp index ad6215a284..dc7d69929a 100644 --- a/tests/unit/capi/GEOSFrechetDistanceTest.cpp +++ b/tests/unit/capi/GEOSFrechetDistanceTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeomToWKBTest.cpp b/tests/unit/capi/GEOSGeomToWKBTest.cpp index e445e47a52..dffeeedb73 100644 --- a/tests/unit/capi/GEOSGeomToWKBTest.cpp +++ b/tests/unit/capi/GEOSGeomToWKBTest.cpp @@ -6,10 +6,8 @@ #include // std #include -#include #include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeomToWKTTest.cpp b/tests/unit/capi/GEOSGeomToWKTTest.cpp index 548da91ead..cbd4c34e2b 100644 --- a/tests/unit/capi/GEOSGeomToWKTTest.cpp +++ b/tests/unit/capi/GEOSGeomToWKTTest.cpp @@ -6,10 +6,7 @@ #include // std #include -#include -#include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_cloneTest.cpp b/tests/unit/capi/GEOSGeom_cloneTest.cpp index 3466a1b958..8ab1e9e6b0 100644 --- a/tests/unit/capi/GEOSGeom_cloneTest.cpp +++ b/tests/unit/capi/GEOSGeom_cloneTest.cpp @@ -1,10 +1,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_createCollectionTest.cpp b/tests/unit/capi/GEOSGeom_createCollectionTest.cpp index 93474d8cb9..6264658518 100644 --- a/tests/unit/capi/GEOSGeom_createCollectionTest.cpp +++ b/tests/unit/capi/GEOSGeom_createCollectionTest.cpp @@ -6,11 +6,8 @@ #include // std #include -#include #include #include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_createRectangleTest.cpp b/tests/unit/capi/GEOSGeom_createRectangleTest.cpp index 95be7a9368..a80be052a0 100644 --- a/tests/unit/capi/GEOSGeom_createRectangleTest.cpp +++ b/tests/unit/capi/GEOSGeom_createRectangleTest.cpp @@ -3,10 +3,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_createTest.cpp b/tests/unit/capi/GEOSGeom_createTest.cpp index 6bfb82c696..aec9ae316e 100644 --- a/tests/unit/capi/GEOSGeom_createTest.cpp +++ b/tests/unit/capi/GEOSGeom_createTest.cpp @@ -5,11 +5,8 @@ // geos #include // std -#include -#include #include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_extentTest.cpp b/tests/unit/capi/GEOSGeom_extentTest.cpp index bf31bd9c85..49a703c5ed 100644 --- a/tests/unit/capi/GEOSGeom_extentTest.cpp +++ b/tests/unit/capi/GEOSGeom_extentTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp b/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp index 3d5c986141..95ca4e05e0 100644 --- a/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp +++ b/tests/unit/capi/GEOSGeom_extractUniquePointsTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGeom_transformXYTest.cpp b/tests/unit/capi/GEOSGeom_transformXYTest.cpp index b2112ea36a..b1295806f5 100644 --- a/tests/unit/capi/GEOSGeom_transformXYTest.cpp +++ b/tests/unit/capi/GEOSGeom_transformXYTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSGetCentroidTest.cpp b/tests/unit/capi/GEOSGetCentroidTest.cpp index f99c78f120..e0fc823fe1 100644 --- a/tests/unit/capi/GEOSGetCentroidTest.cpp +++ b/tests/unit/capi/GEOSGetCentroidTest.cpp @@ -5,11 +5,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSHausdorffDistanceTest.cpp b/tests/unit/capi/GEOSHausdorffDistanceTest.cpp index ead81cd93b..eb569c60a1 100644 --- a/tests/unit/capi/GEOSHausdorffDistanceTest.cpp +++ b/tests/unit/capi/GEOSHausdorffDistanceTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSHilbertCodeTest.cpp b/tests/unit/capi/GEOSHilbertCodeTest.cpp index b70cd1fd87..0220a847f2 100644 --- a/tests/unit/capi/GEOSHilbertCodeTest.cpp +++ b/tests/unit/capi/GEOSHilbertCodeTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSInterruptTest.cpp b/tests/unit/capi/GEOSInterruptTest.cpp index b54ef8d7fa..0843d1bea6 100644 --- a/tests/unit/capi/GEOSInterruptTest.cpp +++ b/tests/unit/capi/GEOSInterruptTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSIntersectionPrecTest.cpp b/tests/unit/capi/GEOSIntersectionPrecTest.cpp index 0d38e06ac8..d6ed8c6206 100644 --- a/tests/unit/capi/GEOSIntersectionPrecTest.cpp +++ b/tests/unit/capi/GEOSIntersectionPrecTest.cpp @@ -5,10 +5,6 @@ // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSIntersectsTest.cpp b/tests/unit/capi/GEOSIntersectsTest.cpp index 395d2698ca..97c1e6506a 100644 --- a/tests/unit/capi/GEOSIntersectsTest.cpp +++ b/tests/unit/capi/GEOSIntersectsTest.cpp @@ -6,9 +6,6 @@ #include #include // std -#include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp b/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp index 6b0e69a869..c47dbbb7db 100644 --- a/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp +++ b/tests/unit/capi/GEOSLargestEmptyCircleTest.cpp @@ -5,11 +5,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSLineMergeDirectedTest.cpp b/tests/unit/capi/GEOSLineMergeDirectedTest.cpp index bd5537d084..1e145abc64 100644 --- a/tests/unit/capi/GEOSLineMergeDirectedTest.cpp +++ b/tests/unit/capi/GEOSLineMergeDirectedTest.cpp @@ -4,9 +4,6 @@ #include // geos #include -// std -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSLineMergeTest.cpp b/tests/unit/capi/GEOSLineMergeTest.cpp index d8c40c4e07..48817c074e 100644 --- a/tests/unit/capi/GEOSLineMergeTest.cpp +++ b/tests/unit/capi/GEOSLineMergeTest.cpp @@ -4,9 +4,6 @@ #include // geos #include -// std -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSLineStringTest.cpp b/tests/unit/capi/GEOSLineStringTest.cpp index 9d90c3b7c7..6e54a7336a 100644 --- a/tests/unit/capi/GEOSLineStringTest.cpp +++ b/tests/unit/capi/GEOSLineStringTest.cpp @@ -4,9 +4,6 @@ // geos #include // std -#include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSLineSubstringTest.cpp b/tests/unit/capi/GEOSLineSubstringTest.cpp index df79b26598..8135a75d5e 100644 --- a/tests/unit/capi/GEOSLineSubstringTest.cpp +++ b/tests/unit/capi/GEOSLineSubstringTest.cpp @@ -4,9 +4,6 @@ #include // geos #include -// std -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSMakeValidTest.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp index 1c6071e94f..c6531d5b83 100644 --- a/tests/unit/capi/GEOSMakeValidTest.cpp +++ b/tests/unit/capi/GEOSMakeValidTest.cpp @@ -4,10 +4,6 @@ // geos #include // std -#include -#include -#include -#include #include #include diff --git a/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp b/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp index 1ca8a79363..c309d0a76a 100644 --- a/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp +++ b/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp @@ -5,11 +5,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp index 5b7c1dff48..f535fce86f 100644 --- a/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp +++ b/tests/unit/capi/GEOSMinimumBoundingCircleTest.cpp @@ -6,7 +6,6 @@ // geos #include // std -#include #include #include #include diff --git a/tests/unit/capi/GEOSMinimumClearanceTest.cpp b/tests/unit/capi/GEOSMinimumClearanceTest.cpp index 0e58f470ab..0647639866 100644 --- a/tests/unit/capi/GEOSMinimumClearanceTest.cpp +++ b/tests/unit/capi/GEOSMinimumClearanceTest.cpp @@ -4,10 +4,6 @@ // geos #include #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp b/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp index 6782d20c2c..b2eff83fd9 100644 --- a/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp +++ b/tests/unit/capi/GEOSMinimumRotatedRectangleTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSMinimumWidthTest.cpp b/tests/unit/capi/GEOSMinimumWidthTest.cpp index 57f935da8f..4b5658126f 100644 --- a/tests/unit/capi/GEOSMinimumWidthTest.cpp +++ b/tests/unit/capi/GEOSMinimumWidthTest.cpp @@ -3,10 +3,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSNearestPointsTest.cpp b/tests/unit/capi/GEOSNearestPointsTest.cpp index d5e7ced4aa..c1caa18875 100644 --- a/tests/unit/capi/GEOSNearestPointsTest.cpp +++ b/tests/unit/capi/GEOSNearestPointsTest.cpp @@ -5,10 +5,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSNodeTest.cpp b/tests/unit/capi/GEOSNodeTest.cpp index 9b11e1a15b..41324bda58 100644 --- a/tests/unit/capi/GEOSNodeTest.cpp +++ b/tests/unit/capi/GEOSNodeTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSOffsetCurveTest.cpp b/tests/unit/capi/GEOSOffsetCurveTest.cpp index b3414dc159..a979155b84 100644 --- a/tests/unit/capi/GEOSOffsetCurveTest.cpp +++ b/tests/unit/capi/GEOSOffsetCurveTest.cpp @@ -5,7 +5,6 @@ // geos #include // std -#include #include #include #include diff --git a/tests/unit/capi/GEOSOrientPolygonsTest.cpp b/tests/unit/capi/GEOSOrientPolygonsTest.cpp index 1b9a7a3d1d..a82955911b 100644 --- a/tests/unit/capi/GEOSOrientPolygonsTest.cpp +++ b/tests/unit/capi/GEOSOrientPolygonsTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSOrientationIndexTest.cpp b/tests/unit/capi/GEOSOrientationIndexTest.cpp index 71e50d6f88..8c827e008a 100644 --- a/tests/unit/capi/GEOSOrientationIndexTest.cpp +++ b/tests/unit/capi/GEOSOrientationIndexTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPointOnSurfaceTest.cpp b/tests/unit/capi/GEOSPointOnSurfaceTest.cpp index 2675a3a7c6..0118234fa6 100644 --- a/tests/unit/capi/GEOSPointOnSurfaceTest.cpp +++ b/tests/unit/capi/GEOSPointOnSurfaceTest.cpp @@ -5,11 +5,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp b/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp index 43f426e046..f769b001fa 100644 --- a/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp +++ b/tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPolygonizeTest.cpp b/tests/unit/capi/GEOSPolygonizeTest.cpp index c0c2eb5764..8ed9325bde 100644 --- a/tests/unit/capi/GEOSPolygonizeTest.cpp +++ b/tests/unit/capi/GEOSPolygonizeTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPreparedDistanceTest.cpp b/tests/unit/capi/GEOSPreparedDistanceTest.cpp index 45147eec22..5ea53f1e08 100644 --- a/tests/unit/capi/GEOSPreparedDistanceTest.cpp +++ b/tests/unit/capi/GEOSPreparedDistanceTest.cpp @@ -5,10 +5,6 @@ // geos #include #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp b/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp index 81e74491ba..7be2a2d2b5 100644 --- a/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp +++ b/tests/unit/capi/GEOSPreparedDistanceWithinTest.cpp @@ -5,10 +5,6 @@ // geos #include #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPreparedGeometryTest.cpp b/tests/unit/capi/GEOSPreparedGeometryTest.cpp index b720214b20..28e24b1874 100644 --- a/tests/unit/capi/GEOSPreparedGeometryTest.cpp +++ b/tests/unit/capi/GEOSPreparedGeometryTest.cpp @@ -8,9 +8,6 @@ #include #include // std -#include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp b/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp index 6ac00004ee..effa0628bf 100644 --- a/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp +++ b/tests/unit/capi/GEOSPreparedNearestPointsTest.cpp @@ -5,10 +5,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSProjectTest.cpp b/tests/unit/capi/GEOSProjectTest.cpp index 91c861823b..af8640f8b7 100644 --- a/tests/unit/capi/GEOSProjectTest.cpp +++ b/tests/unit/capi/GEOSProjectTest.cpp @@ -3,11 +3,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp b/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp index e8b08adf47..d27d4d23b8 100644 --- a/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp +++ b/tests/unit/capi/GEOSRelateBoundaryNodeRuleTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSRelatePatternMatchTest.cpp b/tests/unit/capi/GEOSRelatePatternMatchTest.cpp index b60ab1e188..a942917ef6 100644 --- a/tests/unit/capi/GEOSRelatePatternMatchTest.cpp +++ b/tests/unit/capi/GEOSRelatePatternMatchTest.cpp @@ -5,9 +5,7 @@ // geos #include // std -#include -#include -#include +#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp b/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp index 1a0780b575..0b78590b23 100644 --- a/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp +++ b/tests/unit/capi/GEOSRemoveRepeatedPointsTest.cpp @@ -3,12 +3,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSReverseTest.cpp b/tests/unit/capi/GEOSReverseTest.cpp index fae65d95f7..cb8895d266 100644 --- a/tests/unit/capi/GEOSReverseTest.cpp +++ b/tests/unit/capi/GEOSReverseTest.cpp @@ -3,10 +3,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSSTRtreeTest.cpp b/tests/unit/capi/GEOSSTRtreeTest.cpp index 80c52499d3..ab3697fab2 100644 --- a/tests/unit/capi/GEOSSTRtreeTest.cpp +++ b/tests/unit/capi/GEOSSTRtreeTest.cpp @@ -6,7 +6,6 @@ #include #include // std -#include #include #include #include diff --git a/tests/unit/capi/GEOSSegmentIntersectionTest.cpp b/tests/unit/capi/GEOSSegmentIntersectionTest.cpp index aec95a847d..f3e2c75dae 100644 --- a/tests/unit/capi/GEOSSegmentIntersectionTest.cpp +++ b/tests/unit/capi/GEOSSegmentIntersectionTest.cpp @@ -3,10 +3,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSSharedPathsTest.cpp b/tests/unit/capi/GEOSSharedPathsTest.cpp index db3b24fb9c..e1708d938c 100644 --- a/tests/unit/capi/GEOSSharedPathsTest.cpp +++ b/tests/unit/capi/GEOSSharedPathsTest.cpp @@ -5,10 +5,7 @@ // geos #include // std -#include -#include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSSimplifyTest.cpp b/tests/unit/capi/GEOSSimplifyTest.cpp index 407589b8bb..1de11740bd 100644 --- a/tests/unit/capi/GEOSSimplifyTest.cpp +++ b/tests/unit/capi/GEOSSimplifyTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSSnapTest.cpp b/tests/unit/capi/GEOSSnapTest.cpp index fba18f8e8c..7fedee2e63 100644 --- a/tests/unit/capi/GEOSSnapTest.cpp +++ b/tests/unit/capi/GEOSSnapTest.cpp @@ -5,10 +5,7 @@ // geos #include // std -#include -#include #include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp b/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp index ca84ed8992..1f6bdcb334 100644 --- a/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp +++ b/tests/unit/capi/GEOSTopologyPreserveSimplifyTest.cpp @@ -1,11 +1,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp b/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp index 0f873b9e3e..2c421f5138 100644 --- a/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp +++ b/tests/unit/capi/GEOSUnaryUnionPrecTest.cpp @@ -4,11 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSUnaryUnionTest.cpp b/tests/unit/capi/GEOSUnaryUnionTest.cpp index b33b07a2f3..ad431e12b7 100644 --- a/tests/unit/capi/GEOSUnaryUnionTest.cpp +++ b/tests/unit/capi/GEOSUnaryUnionTest.cpp @@ -5,9 +5,6 @@ // geos #include // std -#include -#include -#include #include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSUserDataTest.cpp b/tests/unit/capi/GEOSUserDataTest.cpp index 18345f769b..9049f7564d 100644 --- a/tests/unit/capi/GEOSUserDataTest.cpp +++ b/tests/unit/capi/GEOSUserDataTest.cpp @@ -1,14 +1,9 @@ // -// Test Suite for C-API GEOSSimplify +// Test Suite for C-API GEOSGeom_setUserData #include // geos #include -// std -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp index b379a49d04..7c5b05bcdc 100644 --- a/tests/unit/capi/GEOSVoronoiDiagramTest.cpp +++ b/tests/unit/capi/GEOSVoronoiDiagramTest.cpp @@ -6,10 +6,6 @@ #include // std #include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSWithinTest.cpp b/tests/unit/capi/GEOSWithinTest.cpp index 703a9b86e6..387f409090 100644 --- a/tests/unit/capi/GEOSWithinTest.cpp +++ b/tests/unit/capi/GEOSWithinTest.cpp @@ -4,10 +4,6 @@ #include // geos #include -// std -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSisClosedTest.cpp b/tests/unit/capi/GEOSisClosedTest.cpp index 656ec1ab15..2b322542e2 100644 --- a/tests/unit/capi/GEOSisClosedTest.cpp +++ b/tests/unit/capi/GEOSisClosedTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSisRingTest.cpp b/tests/unit/capi/GEOSisRingTest.cpp index 1d0b6da476..0f263be6cb 100644 --- a/tests/unit/capi/GEOSisRingTest.cpp +++ b/tests/unit/capi/GEOSisRingTest.cpp @@ -4,12 +4,6 @@ #include // geos #include -// std -#include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/GEOSisValidDetailTest.cpp b/tests/unit/capi/GEOSisValidDetailTest.cpp index 56d005268e..4c0c12e9eb 100644 --- a/tests/unit/capi/GEOSisValidDetailTest.cpp +++ b/tests/unit/capi/GEOSisValidDetailTest.cpp @@ -6,10 +6,6 @@ #include // std #include -#include -#include -#include -#include #include "capi_test_utils.h" diff --git a/tests/unit/capi/capi_test_utils.h b/tests/unit/capi/capi_test_utils.h index 803c51cf21..d0aba45126 100644 --- a/tests/unit/capi/capi_test_utils.h +++ b/tests/unit/capi/capi_test_utils.h @@ -7,8 +7,6 @@ #include #include -#include -#include #include diff --git a/tests/unit/geomgraph/TopologyLocationTest.cpp b/tests/unit/geomgraph/TopologyLocationTest.cpp index 86bc6d6020..731dcfd72e 100644 --- a/tests/unit/geomgraph/TopologyLocationTest.cpp +++ b/tests/unit/geomgraph/TopologyLocationTest.cpp @@ -6,10 +6,6 @@ // geos #include #include -// std -#include -#include -#include using TopologyLocation = geos::geomgraph::TopologyLocation; using Location = geos::geom::Location; diff --git a/tests/unit/index/VertexSequencePackedRtreeTest.cpp b/tests/unit/index/VertexSequencePackedRtreeTest.cpp index 554187f703..b224db6ae2 100644 --- a/tests/unit/index/VertexSequencePackedRtreeTest.cpp +++ b/tests/unit/index/VertexSequencePackedRtreeTest.cpp @@ -12,9 +12,6 @@ #include #include -// std -#include - using geos::index::VertexSequencePackedRtree; using geos::geom::Point; diff --git a/tests/unit/index/strtree/SimpleSTRtreeTest.cpp b/tests/unit/index/strtree/SimpleSTRtreeTest.cpp index 7e15311f02..f13edf7a06 100644 --- a/tests/unit/index/strtree/SimpleSTRtreeTest.cpp +++ b/tests/unit/index/strtree/SimpleSTRtreeTest.cpp @@ -8,8 +8,6 @@ #include #include -#include - using namespace geos; namespace tut { diff --git a/tests/unit/index/strtree/TemplateSTRtreeTest.cpp b/tests/unit/index/strtree/TemplateSTRtreeTest.cpp index 75de4f7042..701b356e79 100644 --- a/tests/unit/index/strtree/TemplateSTRtreeTest.cpp +++ b/tests/unit/index/strtree/TemplateSTRtreeTest.cpp @@ -8,8 +8,6 @@ #include #include -#include - using namespace geos; using geos::index::strtree::TemplateSTRtree; using geos::geom::Geometry; diff --git a/tests/unit/io/ByteOrderValuesTest.cpp b/tests/unit/io/ByteOrderValuesTest.cpp index 22fc3a0246..f483fd2fd9 100644 --- a/tests/unit/io/ByteOrderValuesTest.cpp +++ b/tests/unit/io/ByteOrderValuesTest.cpp @@ -6,9 +6,6 @@ // geos #include #include // for int64 -// std -#include -#include namespace tut { // diff --git a/tests/unit/io/GeoJSONFeatureTest.cpp b/tests/unit/io/GeoJSONFeatureTest.cpp index 0f9b4a8d99..701302289e 100644 --- a/tests/unit/io/GeoJSONFeatureTest.cpp +++ b/tests/unit/io/GeoJSONFeatureTest.cpp @@ -14,7 +14,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/io/GeoJSONReaderTest.cpp b/tests/unit/io/GeoJSONReaderTest.cpp index bcbb9fead4..07987226e5 100644 --- a/tests/unit/io/GeoJSONReaderTest.cpp +++ b/tests/unit/io/GeoJSONReaderTest.cpp @@ -13,7 +13,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/io/GeoJSONValueTest.cpp b/tests/unit/io/GeoJSONValueTest.cpp index 7b539ff08b..2bf1f3d01e 100644 --- a/tests/unit/io/GeoJSONValueTest.cpp +++ b/tests/unit/io/GeoJSONValueTest.cpp @@ -6,9 +6,7 @@ // geos #include // std -#include #include -#include namespace tut { @@ -99,4 +97,4 @@ void object::test<6> ensure_equals(3, value.getArray()[2].getNumber()); } -} \ No newline at end of file +} diff --git a/tests/unit/io/WKTWriterTest.cpp b/tests/unit/io/WKTWriterTest.cpp index 8618f8be03..bc1d456e48 100644 --- a/tests/unit/io/WKTWriterTest.cpp +++ b/tests/unit/io/WKTWriterTest.cpp @@ -20,7 +20,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/io/WriterTest.cpp b/tests/unit/io/WriterTest.cpp index d616e41367..69ab6296a3 100644 --- a/tests/unit/io/WriterTest.cpp +++ b/tests/unit/io/WriterTest.cpp @@ -6,9 +6,7 @@ // geos #include // std -#include #include -#include namespace tut { // diff --git a/tests/unit/linearref/LengthIndexedLineTest.cpp b/tests/unit/linearref/LengthIndexedLineTest.cpp index 09909f6bf7..8ab1bd38d0 100644 --- a/tests/unit/linearref/LengthIndexedLineTest.cpp +++ b/tests/unit/linearref/LengthIndexedLineTest.cpp @@ -16,7 +16,6 @@ // std #include -#include #include #include diff --git a/tests/unit/math/DDTest.cpp b/tests/unit/math/DDTest.cpp index 93d3f1ea1c..b98cbae336 100644 --- a/tests/unit/math/DDTest.cpp +++ b/tests/unit/math/DDTest.cpp @@ -10,10 +10,6 @@ #include #include -// std -#include -#include - using namespace geos::math; namespace tut { diff --git a/tests/unit/noding/NodedSegmentStringTest.cpp b/tests/unit/noding/NodedSegmentStringTest.cpp index dbda3eb6bf..35100878fa 100644 --- a/tests/unit/noding/NodedSegmentStringTest.cpp +++ b/tests/unit/noding/NodedSegmentStringTest.cpp @@ -18,7 +18,6 @@ using geos::io::WKTReader; using geos::geom::CoordinateSequence; using geos::geom::Geometry; -//using geos::geom::LineString; using geos::geom::GeometryFactory; using geos::noding::SegmentString; diff --git a/tests/unit/noding/snapround/HotPixelTest.cpp b/tests/unit/noding/snapround/HotPixelTest.cpp index a7cb0c129a..5ed39ba2e3 100644 --- a/tests/unit/noding/snapround/HotPixelTest.cpp +++ b/tests/unit/noding/snapround/HotPixelTest.cpp @@ -8,8 +8,6 @@ #include #include #include -// std -#include using namespace geos::geom; using namespace geos::noding::snapround; diff --git a/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp b/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp index 4221bad3b0..11d760c55d 100644 --- a/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp +++ b/tests/unit/noding/snapround/MCIndexSnapRounderTest.cpp @@ -20,11 +20,7 @@ #include // std #include -#include #include -#include -#include - namespace tut { // diff --git a/tests/unit/operation/BoundaryOpTest.cpp b/tests/unit/operation/BoundaryOpTest.cpp index fc8aa1e68f..de392dbff6 100644 --- a/tests/unit/operation/BoundaryOpTest.cpp +++ b/tests/unit/operation/BoundaryOpTest.cpp @@ -5,8 +5,6 @@ #include #include // std -#include -#include #include #include diff --git a/tests/unit/operation/buffer/BufferBuilderTest.cpp b/tests/unit/operation/buffer/BufferBuilderTest.cpp index e3f4613c91..09f8a71194 100644 --- a/tests/unit/operation/buffer/BufferBuilderTest.cpp +++ b/tests/unit/operation/buffer/BufferBuilderTest.cpp @@ -18,7 +18,6 @@ // std #include #include -#include namespace tut { // diff --git a/tests/unit/operation/buffer/BufferOpTest.cpp b/tests/unit/operation/buffer/BufferOpTest.cpp index 478704424f..56310200b1 100644 --- a/tests/unit/operation/buffer/BufferOpTest.cpp +++ b/tests/unit/operation/buffer/BufferOpTest.cpp @@ -19,7 +19,6 @@ // std #include #include -#include namespace tut { // diff --git a/tests/unit/operation/buffer/OffsetCurveTest.cpp b/tests/unit/operation/buffer/OffsetCurveTest.cpp index 76b01c4df4..8d223464c8 100644 --- a/tests/unit/operation/buffer/OffsetCurveTest.cpp +++ b/tests/unit/operation/buffer/OffsetCurveTest.cpp @@ -10,7 +10,6 @@ #include #include #include -// #include // std #include diff --git a/tests/unit/operation/distance/DistanceOpTest.cpp b/tests/unit/operation/distance/DistanceOpTest.cpp index 9df481a397..32eee5bbff 100644 --- a/tests/unit/operation/distance/DistanceOpTest.cpp +++ b/tests/unit/operation/distance/DistanceOpTest.cpp @@ -20,7 +20,6 @@ // std #include #include -#include namespace tut { // diff --git a/tests/unit/operation/geounion/CoverageUnionTest.cpp b/tests/unit/operation/geounion/CoverageUnionTest.cpp index 50135e195f..4da7a6ed91 100644 --- a/tests/unit/operation/geounion/CoverageUnionTest.cpp +++ b/tests/unit/operation/geounion/CoverageUnionTest.cpp @@ -17,7 +17,6 @@ #include #include #include -#include namespace tut { // diff --git a/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp b/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp index a898a60f42..7866fb732b 100644 --- a/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp +++ b/tests/unit/operation/overlay/snap/GeometrySnapperTest.cpp @@ -11,7 +11,6 @@ // std #include #include -#include namespace tut { // diff --git a/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp b/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp index a03163f93f..6342b4243e 100644 --- a/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp +++ b/tests/unit/operation/overlay/snap/LineStringSnapperTest.cpp @@ -9,7 +9,6 @@ #include #include // std -#include #include using geos::geom::CoordinateSequence; diff --git a/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp b/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp index a49b5aec77..e2fccc582d 100644 --- a/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp +++ b/tests/unit/operation/overlay/validate/OverlayResultValidatorTest.cpp @@ -13,7 +13,6 @@ #include // std #include -#include namespace tut { using namespace geos::operation::overlay; diff --git a/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp b/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp index ab9d09da35..5c481cac30 100644 --- a/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp +++ b/tests/unit/operation/relate/RelateBoundaryNodeRuleTest.cpp @@ -5,7 +5,6 @@ #include #include // std -#include #include #include diff --git a/tests/unit/operation/relate/RelateOpTest.cpp b/tests/unit/operation/relate/RelateOpTest.cpp index 9c75fd33b2..92759da808 100644 --- a/tests/unit/operation/relate/RelateOpTest.cpp +++ b/tests/unit/operation/relate/RelateOpTest.cpp @@ -20,7 +20,6 @@ #include #include // std -#include #include #include #include diff --git a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp index 58d9ef046b..ded1c83fcf 100644 --- a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp +++ b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp @@ -15,7 +15,6 @@ // std #include #include -#include namespace tut { // diff --git a/tests/unit/operation/valid/MakeValidTest.cpp b/tests/unit/operation/valid/MakeValidTest.cpp index 188f41a523..0a6cdddf48 100644 --- a/tests/unit/operation/valid/MakeValidTest.cpp +++ b/tests/unit/operation/valid/MakeValidTest.cpp @@ -12,11 +12,6 @@ #include #include -// std -#include -#include -#include -#include using namespace geos::geom; using namespace geos::operation::valid; diff --git a/tests/unit/operation/valid/ValidClosedRingTest.cpp b/tests/unit/operation/valid/ValidClosedRingTest.cpp index 9ef97c8700..54074f678d 100644 --- a/tests/unit/operation/valid/ValidClosedRingTest.cpp +++ b/tests/unit/operation/valid/ValidClosedRingTest.cpp @@ -17,13 +17,11 @@ #include #include // std -#include #include #include #include using namespace geos::geom; -//using namespace geos::operation; using namespace geos::operation::valid; using namespace geos::util; using namespace std; diff --git a/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp b/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp index 944a2ff0dc..98d986f2b6 100644 --- a/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp +++ b/tests/unit/operation/valid/ValidSelfTouchingRingFormingHoleTest.cpp @@ -17,7 +17,6 @@ #include #include // std -#include #include #include #include diff --git a/tests/unit/precision/GeometryPrecisionReducerTest.cpp b/tests/unit/precision/GeometryPrecisionReducerTest.cpp index bd51e355c1..7c2161ddf6 100644 --- a/tests/unit/precision/GeometryPrecisionReducerTest.cpp +++ b/tests/unit/precision/GeometryPrecisionReducerTest.cpp @@ -13,8 +13,6 @@ #include // std #include -#include -#include using namespace geos::geom; using namespace geos::precision; diff --git a/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp b/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp index aec43a41a5..1371f7d150 100644 --- a/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp +++ b/tests/unit/precision/SimpleGeometryPrecisionReducerTest.cpp @@ -11,7 +11,6 @@ #include // std #include -#include namespace tut { // diff --git a/tests/unit/triangulate/DelaunayTest.cpp b/tests/unit/triangulate/DelaunayTest.cpp index 0b324c7df9..eb8d859ea3 100644 --- a/tests/unit/triangulate/DelaunayTest.cpp +++ b/tests/unit/triangulate/DelaunayTest.cpp @@ -11,12 +11,10 @@ #include #include #include -//#include #include #include #include #include -//#include using namespace geos::triangulate; using namespace geos::triangulate::quadedge; diff --git a/tests/unit/triangulate/VoronoiTest.cpp b/tests/unit/triangulate/VoronoiTest.cpp index 5333de0dcc..dd9066a95c 100644 --- a/tests/unit/triangulate/VoronoiTest.cpp +++ b/tests/unit/triangulate/VoronoiTest.cpp @@ -19,8 +19,8 @@ #include #include -//#include #include + using namespace geos::triangulate; using namespace geos::triangulate::quadedge; using namespace geos::geom; diff --git a/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp b/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp index 0380a416c0..d236962ea4 100644 --- a/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp +++ b/tests/unit/triangulate/polygon/ConstrainedDelaunayTriangulatorTest.cpp @@ -11,9 +11,6 @@ #include #include -// std -#include - using geos::triangulate::polygon::ConstrainedDelaunayTriangulator; using geos::geom::Geometry; diff --git a/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp b/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp index 3a61c17825..70e56c2e73 100644 --- a/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp +++ b/tests/unit/triangulate/polygon/PolygonHoleJoinerTest.cpp @@ -13,9 +13,6 @@ #include #include -// std -#include - using geos::triangulate::polygon::PolygonHoleJoiner; using geos::geom::CoordinateSequence; using geos::geom::Geometry; diff --git a/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp b/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp index a1e2032b94..5755807b01 100644 --- a/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp +++ b/tests/unit/triangulate/polygon/PolygonTriangulatorTest.cpp @@ -13,9 +13,6 @@ #include #include -// std -#include - using geos::triangulate::polygon::PolygonTriangulator; using geos::geom::CoordinateSequence; using geos::geom::Geometry; diff --git a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp index 9521a8a7e8..05e0221a1f 100644 --- a/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp +++ b/tests/unit/triangulate/quadedge/QuadEdgeSubdivisionTest.cpp @@ -21,9 +21,8 @@ #include #include // std -#include -#include #include + using namespace geos::triangulate::quadedge; using namespace geos::triangulate; using namespace geos::geom; diff --git a/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp b/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp index c6f877731a..a6c4519a30 100644 --- a/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp +++ b/tests/unit/triangulate/quadedge/QuadEdgeTest.cpp @@ -7,8 +7,6 @@ #include #include #include -// std -#include using namespace geos::triangulate::quadedge; diff --git a/tests/unit/triangulate/quadedge/VertexTest.cpp b/tests/unit/triangulate/quadedge/VertexTest.cpp index 62c10a0543..ee7a8b829c 100644 --- a/tests/unit/triangulate/quadedge/VertexTest.cpp +++ b/tests/unit/triangulate/quadedge/VertexTest.cpp @@ -8,8 +8,6 @@ #include //#include #include -// std -#include using namespace geos::triangulate::quadedge; From 34fb7063aef63196a301de9d0d1d2072cc3aaf24 Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Thu, 15 Aug 2024 14:12:19 -0400 Subject: [PATCH 4/5] CMake: Reduce optimization level for tests Reducing to -O0 disables precompiled headers and actually increases build time. --- tests/unit/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 855641ed37..1a611a0bbe 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -9,7 +9,9 @@ # by the Free Software Foundation. # See the COPYING file for more information. ################################################################################ + file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.cpp CONFIGURE_DEPEND) +set_source_files_properties(${_sources} PROPERTIES COMPILE_FLAGS -O1) add_executable(test_geos_unit ${_sources}) unset(_sources) From 97f59c200226d1af75e7640a721e9893797a255a Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Thu, 15 Aug 2024 14:59:53 -0400 Subject: [PATCH 5/5] CMake: Disable precompiled headers --- tests/unit/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 1a611a0bbe..3dd430bb5f 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -22,13 +22,10 @@ target_include_directories(test_geos_unit PRIVATE $) -# Precompile TUT when using gcc -# Some clang and MSVC CI configurations complain about the combination of -# PCH and -O1 -if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.16") - target_precompile_headers(test_geos_unit PRIVATE - "$<$:${CMAKE_CURRENT_LIST_DIR}/tut/tut.hpp>") -endif() +# Precompile TUT +#if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.16") +# target_precompile_headers(test_geos_unit PRIVATE "${CMAKE_CURRENT_LIST_DIR}/tut/tut.hpp") +#endif() file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/**/*Test.cpp CONFIGURE_DEPEND) foreach(_testfile ${_testfiles})