Skip to content

Commit c66c9e8

Browse files
committed
Remove unnecessary includes from tests and tut.
From @dbaston. Closes #1141.
1 parent 737904e commit c66c9e8

File tree

147 files changed

+77
-478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+77
-478
lines changed

tests/unit/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# by the Free Software Foundation.
1010
# See the COPYING file for more information.
1111
################################################################################
12+
1213
file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.cpp CONFIGURE_DEPEND)
1314
add_executable(test_geos_unit ${_sources})
1415
unset(_sources)

tests/unit/algorithm/AngleTest.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include <geos/geom/Coordinate.h>
88
#include <geos/algorithm/Angle.h>
99
// std
10-
#include <sstream>
1110
#include <string>
12-
#include <memory>
1311

1412
namespace tut {
1513
//

tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// std
1616
#include <string>
1717
#include <memory>
18-
#include <cassert>
1918
#include <sstream>
2019

2120
using namespace geos::algorithm;

tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <string>
1616
#include <memory>
1717
#include <cassert>
18-
#include <sstream>
1918

2019
using namespace geos::algorithm;
2120

tests/unit/algorithm/CentroidTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <geos/geom/PrecisionModel.h>
1313
#include <geos/io/WKTReader.h>
1414
// std
15-
#include <sstream>
1615
#include <string>
1716
#include <memory>
1817

tests/unit/algorithm/ConvexHullTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// std
1818
#include <sstream>
1919
#include <memory>
20-
#include <cassert>
2120

2221
namespace geos {
2322
namespace geom {

tests/unit/algorithm/InteriorPointAreaTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <geos/io/WKTReader.h>
2424
#include <geos/geom/Geometry.h>
2525
// std
26-
#include <sstream>
2726
#include <string>
2827
#include <memory>
2928

tests/unit/algorithm/IntersectionTest.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <geos/io/WKTReader.h>
2424
#include <geos/geom/Geometry.h>
2525
// std
26-
#include <sstream>
27-
#include <string>
2826
#include <memory>
2927

3028
namespace tut {

tests/unit/algorithm/LengthTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <geos/geom/PrecisionModel.h>
1414
#include <geos/io/WKTReader.h>
1515
// std
16-
#include <sstream>
1716
#include <string>
1817
#include <memory>
1918

tests/unit/algorithm/MinimumAreaRectangleTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <geos/geom/Geometry.h>
99
#include <utility.h>
1010
// std
11-
#include <sstream>
1211
#include <string>
1312
#include <memory>
1413

tests/unit/algorithm/MinimumBoundingCircleTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <geos/io/WKTReader.h>
2626

2727
// std
28-
#include <sstream>
2928
#include <string>
3029
#include <memory>
3130

tests/unit/algorithm/MinimumDiameterTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <geos/io/WKTWriter.h>
2424
#include <geos/geom/Geometry.h>
2525
// std
26-
#include <sstream>
2726
#include <string>
2827
#include <memory>
2928

tests/unit/algorithm/OrientationIndexFailureTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#include <geos/geom/Coordinate.h>
88
#include <geos/algorithm/Orientation.h>
99
// std
10-
#include <sstream>
11-
#include <string>
12-
#include <memory>
1310

1411
using namespace geos::geom;
1512
using namespace geos::algorithm;

tests/unit/algorithm/PointLocationTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <geos/algorithm/PointLocation.h>
1111

1212
// std
13-
#include <sstream>
1413
#include <string>
1514
#include <memory>
1615

tests/unit/algorithm/PointLocatorTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <geos/geom/Geometry.h> // required for use in unique_ptr
1313
#include <geos/geom/Coordinate.h>
1414
// std
15-
#include <sstream>
1615
#include <string>
1716
#include <memory>
1817

tests/unit/algorithm/PolygonNodeTopologyTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <geos/algorithm/PolygonNodeTopology.h>
1010

1111
// std
12-
#include <sstream>
1312
#include <string>
1413
#include <memory>
1514

tests/unit/algorithm/RobustLineIntersectionTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <geos/geom/LineString.h>
1212
#include <geos/geom/Coordinate.h>
1313
// std
14-
#include <sstream>
1514
#include <string>
1615
#include <memory>
1716

tests/unit/algorithm/RobustLineIntersectorZTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#include <geos/geom/Coordinate.h>
1111
#include <geos/geom/LineSegment.h>
1212
// std
13-
#include <sstream>
14-
#include <string>
15-
#include <memory>
1613
#include <utility>
1714

1815

tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <geos/io/WKTReader.h>
1212
#include <geos/constants.h>
1313
// std
14-
#include <sstream>
1514
#include <string>
1615
#include <memory>
1716

tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <geos/io/WKTWriter.h>
1616
#include <geos/util.h>
1717
// std
18-
#include <sstream>
1918
#include <string>
2019
#include <memory>
2120

tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <geos/util.h>
1515
// std
1616
#include <cmath>
17-
#include <sstream>
1817
#include <string>
1918
#include <memory>
2019

tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <geos/geom/Coordinate.h>
1515
// std
1616
#include <cmath>
17-
#include <sstream>
1817
#include <string>
1918
#include <memory>
2019
#include <cfenv>

tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <geos/constants.h>
1111
#include <utility.h>
1212
// std
13-
#include <sstream>
1413
#include <string>
1514
#include <memory>
1615

tests/unit/algorithm/hull/ConcaveHullTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <geos/constants.h>
1111
#include <utility.h>
1212
// std
13-
#include <sstream>
1413
#include <string>
1514
#include <memory>
1615

tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#include <geos/algorithm/locate/IndexedPointInAreaLocator.h>
66

77
// std
8-
#include <sstream>
9-
#include <string>
108
#include <memory>
119

1210
using geos::geom::CoordinateXY;

tests/unit/capi/GEOSBufferTest.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <cstring>
128

139
#include "capi_test_utils.h"
1410

tests/unit/capi/GEOSBuildAreaTest.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// geos
55
#include <geos_c.h>
66
// std
7-
#include <cstdarg>
8-
#include <cstdio>
9-
#include <cstdlib>
10-
#include <cmath>
117

128
#include "capi_test_utils.h"
139

tests/unit/capi/GEOSCAPIDefinesTest.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <cstring>
128

139
#define QUOTE(x) #x
1410
#define EXPAND_AND_QUOTE(y) QUOTE(y)

tests/unit/capi/GEOSClipByRectTest.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
98
#include <cstdio>
109
#include <cstdlib>
11-
#include <memory>
1210

1311
#include "capi_test_utils.h"
1412

tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
118

129
#include "capi_test_utils.h"
1310

tests/unit/capi/GEOSConcaveHullTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
118

129
#include "capi_test_utils.h"
1310

tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <memory>
128

139
#include "capi_test_utils.h"
1410

tests/unit/capi/GEOSContainsTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#include <geos/geom/PrecisionModel.h>
99
#include <geos/geom/GeometryFactory.h>
1010
// std
11-
#include <cstdarg>
12-
#include <cstdio>
13-
#include <cstdlib>
1411

1512
#include "capi_test_utils.h"
1613

tests/unit/capi/GEOSConvexHullTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
118

129
#include "capi_test_utils.h"
1310

tests/unit/capi/GEOSCoordSeqTest.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
// geos
66
#include <geos_c.h>
77
// std
8-
#include <cstdarg>
8+
#include <algorithm>
99
#include <cstdio>
1010
#include <cstdlib>
11-
#include <memory>
1211

1312
#include "capi_test_utils.h"
1413

tests/unit/capi/GEOSCoverageIsValidTest.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
#include <tut/tut.hpp>
55
// geos
66
#include <geos_c.h>
7-
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <cstring>
127

138
#include "capi_test_utils.h"
149

tests/unit/capi/GEOSCoverageSimplifyTest.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
#include <tut/tut.hpp>
55
// geos
66
#include <geos_c.h>
7-
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <cstring>
127

138
#include "capi_test_utils.h"
149

tests/unit/capi/GEOSCoverageUnionTest.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
#include <tut/tut.hpp>
55
// geos
66
#include <geos_c.h>
7-
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <cstring>
127

138
#include "capi_test_utils.h"
149

tests/unit/capi/GEOSDelaunayTriangulationTest.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
#include <tut/tut.hpp>
55
// geos
66
#include <geos_c.h>
7-
// std
8-
#include <cstdarg>
9-
#include <cstdio>
10-
#include <cstdlib>
11-
#include <memory>
127

138
#include "capi_test_utils.h"
149

tests/unit/capi/GEOSDistanceTest.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
#include <geos_c.h>
77
#include <geos/constants.h>
88
// std
9-
#include <cstdarg>
9+
#include <algorithm>
1010
#include <cstdio>
1111
#include <cstdlib>
1212
#include <fenv.h>
13-
#include <memory>
1413
#include <cmath>
1514

1615
#include "capi_test_utils.h"

tests/unit/capi/GEOSDistanceWithinTest.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
// geos
66
#include <geos/constants.h>
77
#include <geos_c.h>
8-
// std
9-
#include <limits>
10-
#include <cstdarg>
11-
#include <cstdio>
12-
#include <cstdlib>
13-
#include <math.h>
14-
#include <memory>
158

169
#include "capi_test_utils.h"
1710

tests/unit/capi/GEOSEqualsTest.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
#include <geos/constants.h>
77
#include <geos_c.h>
88
// std
9-
#include <cstdarg>
10-
#include <cstdio>
11-
#include <cstdlib>
129
#include <cstring>
1310

1411
#include "capi_test_utils.h"

0 commit comments

Comments
 (0)