[geos-commits] [SCM] GEOS branch master updated. 0c17f05ad648f8c62352f7ff6998b4ffb6661861
git at osgeo.org
git at osgeo.org
Wed Sep 18 20:09:12 PDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via 0c17f05ad648f8c62352f7ff6998b4ffb6661861 (commit)
via 48eb7bc8fd595a2cbae9d0f5ef25a01f89fe7557 (commit)
via e9ca63a3a3d2243bcdadcc5cd591917268482a82 (commit)
from 10b58fc8482345800fe377e7cd8697c92ac2ece1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0c17f05ad648f8c62352f7ff6998b4ffb6661861
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Sep 18 23:05:29 2019 -0400
Fix CMake inference of test suite name from file name
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 024f599..e8052a7 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -24,7 +24,9 @@ foreach(_testfile ${_testfiles})
string(REPLACE "Test.cpp" "" _testname ${_testname})
string(REPLACE "/" "-" _cmake_testname ${_testname})
string(REPLACE "/" "::" _testname ${_testname})
- string(CONCAT _testname "geos::" ${_testname})
+ if (NOT ${_testname} MATCHES "^capi::")
+ string(CONCAT _testname "geos::" ${_testname})
+ endif()
add_test(NAME unit-${_cmake_testname} COMMAND test_geos_unit ${_testname})
endforeach()
unset(_cmake_testname)
commit 48eb7bc8fd595a2cbae9d0f5ef25a01f89fe7557
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Sep 18 22:48:30 2019 -0400
Standardize test file naming
Test file names should end in "Test.cpp"
Test suite names should match test file names
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index a72fd10..024f599 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -24,6 +24,7 @@ foreach(_testfile ${_testfiles})
string(REPLACE "Test.cpp" "" _testname ${_testname})
string(REPLACE "/" "-" _cmake_testname ${_testname})
string(REPLACE "/" "::" _testname ${_testname})
+ string(CONCAT _testname "geos::" ${_testname})
add_test(NAME unit-${_cmake_testname} COMMAND test_geos_unit ${_testname})
endforeach()
unset(_cmake_testname)
diff --git a/tests/unit/algorithm/CGAlgorithms/computeOrientationTest.cpp b/tests/unit/algorithm/CGAlgorithms/computeOrientationTest.cpp
index da8d076..bbe2f38 100644
--- a/tests/unit/algorithm/CGAlgorithms/computeOrientationTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/computeOrientationTest.cpp
@@ -33,7 +33,7 @@ struct test_computeorientation_data {
typedef test_group<test_computeorientation_data> group;
typedef group::object object;
-group test_computeorientation_group("geos::algorithm::Orientation::index");
+group test_computeorientation_group("geos::algorithm::CGAlgorithms::computeOrientation");
//
// Test Cases
diff --git a/tests/unit/algorithm/CGAlgorithms/isCCWTest.cpp b/tests/unit/algorithm/CGAlgorithms/isCCWTest.cpp
index eaa4004..e972776 100644
--- a/tests/unit/algorithm/CGAlgorithms/isCCWTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/isCCWTest.cpp
@@ -46,7 +46,7 @@ struct test_isccw_data {
typedef test_group<test_isccw_data> group;
typedef group::object object;
-group test_isccw_group("geos::algorithm::Orientation::isCCW");
+group test_isccw_group("geos::algorithm::CGAlgorithms::isCCW");
//
// Test Cases
diff --git a/tests/unit/algorithm/CGAlgorithms/isPointInRingTest.cpp b/tests/unit/algorithm/CGAlgorithms/isPointInRingTest.cpp
index 53bb741..2b485e4 100644
--- a/tests/unit/algorithm/CGAlgorithms/isPointInRingTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/isPointInRingTest.cpp
@@ -41,7 +41,7 @@ struct test_ispointinring_data {
typedef test_group<test_ispointinring_data> group;
typedef group::object object;
-group test_ispointintring_group("geos::algorithm::PointLocation::isInRing");
+group test_ispointintring_group("geos::algorithm::CGAlgorithms::isPointInRing");
//
// Test Cases
diff --git a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
index 5d2b370..e75d614 100644
--- a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
+++ b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
@@ -45,7 +45,7 @@ struct test_signedarea_data {
typedef test_group<test_signedarea_data> group;
typedef group::object object;
-group test_signedarea_group("geos::algorithm::Area::ofRingSigned");
+group test_signedarea_group("geos::algorithm::CGAlgorithms::signedArea");
//
// Test Cases
diff --git a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
index 039045f..203657d 100644
--- a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
+++ b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
@@ -82,7 +82,7 @@ const double test_DiscreteFrechetDistance_data::TOLERANCE = 0.00001;
typedef test_group<test_DiscreteFrechetDistance_data> group;
typedef group::object object;
-group test_DiscreteFrechetDistance_group("geos::algorithm::distace::DiscreteFrechetDistance");
+group test_DiscreteFrechetDistance_group("geos::algorithm::distance::DiscreteFrechetDistance");
diff --git a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
index 4c9aa94..4479f43 100644
--- a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
+++ b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
@@ -83,7 +83,7 @@ const double test_DiscreteHausdorffDistance_data::TOLERANCE = 0.00001;
typedef test_group<test_DiscreteHausdorffDistance_data> group;
typedef group::object object;
-group test_DiscreteHausdorffDistance_group("geos::algorithm::distace::DiscreteHausdorffDistance");
+group test_DiscreteHausdorffDistance_group("geos::algorithm::distance::DiscreteHausdorffDistance");
diff --git a/tests/unit/capi/GEOSBuildArea.cpp b/tests/unit/capi/GEOSBuildAreaTest.cpp
similarity index 100%
rename from tests/unit/capi/GEOSBuildArea.cpp
rename to tests/unit/capi/GEOSBuildAreaTest.cpp
diff --git a/tests/unit/capi/GEOSCAPIDefinesTest.cpp b/tests/unit/capi/GEOSCAPIDefinesTest.cpp
index 4f72373..d331e55 100644
--- a/tests/unit/capi/GEOSCAPIDefinesTest.cpp
+++ b/tests/unit/capi/GEOSCAPIDefinesTest.cpp
@@ -23,7 +23,7 @@ struct basic {};
typedef test_group<basic> group;
typedef group::object object;
-group test_capidefines_group("capi::defines");
+group test_capidefines_group("capi::GEOSCAPIDefines");
// Make sure version elements all defined
template<>
diff --git a/tests/unit/capi/GEOSGeom_createCollection.cpp b/tests/unit/capi/GEOSGeom_createCollectionTest.cpp
similarity index 100%
rename from tests/unit/capi/GEOSGeom_createCollection.cpp
rename to tests/unit/capi/GEOSGeom_createCollectionTest.cpp
diff --git a/tests/unit/capi/GEOSGeom_create.cpp b/tests/unit/capi/GEOSGeom_createTest.cpp
similarity index 100%
rename from tests/unit/capi/GEOSGeom_create.cpp
rename to tests/unit/capi/GEOSGeom_createTest.cpp
diff --git a/tests/unit/capi/GEOSGeom_extentTest.cpp b/tests/unit/capi/GEOSGeom_extentTest.cpp
index 637c20c..c5681b2 100644
--- a/tests/unit/capi/GEOSGeom_extentTest.cpp
+++ b/tests/unit/capi/GEOSGeom_extentTest.cpp
@@ -39,7 +39,7 @@ struct test_capigeosgeom_extent {
typedef test_group<test_capigeosgeom_extent> group;
typedef group::object object;
-group test_capigeosgeom_extent_group("capi::GEOSGeom_getXYMinMax");
+group test_capigeosgeom_extent_group("capi::GEOSGeom_extent");
template<>
template<>
diff --git a/tests/unit/capi/GEOSLineString_PointTest.cpp b/tests/unit/capi/GEOSLineString_PointTest.cpp
index 1c57f9c..76bc5fd 100644
--- a/tests/unit/capi/GEOSLineString_PointTest.cpp
+++ b/tests/unit/capi/GEOSLineString_PointTest.cpp
@@ -49,7 +49,7 @@ struct test_capilinestringpoint_data {
typedef test_group<test_capilinestringpoint_data> group;
typedef group::object object;
-group test_capilinestringpoint_group("capi::GEOSLineStringPoint");
+group test_capilinestringpoint_group("capi::GEOSLineString_Point");
//
// Test Cases
diff --git a/tests/unit/capi/GEOSMakeValid.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp
similarity index 100%
rename from tests/unit/capi/GEOSMakeValid.cpp
rename to tests/unit/capi/GEOSMakeValidTest.cpp
diff --git a/tests/unit/capi/GEOSMinimumRectangleTest.cpp b/tests/unit/capi/GEOSMinimumRectangleTest.cpp
index 49fed1f..647418e 100644
--- a/tests/unit/capi/GEOSMinimumRectangleTest.cpp
+++ b/tests/unit/capi/GEOSMinimumRectangleTest.cpp
@@ -57,7 +57,7 @@ struct test_capigeosminimumrectangle_data {
typedef test_group<test_capigeosminimumrectangle_data> group;
typedef group::object object;
-group test_capigeosminimumrectangle_group("capi::GEOSMinimumRotatedRectangle");
+group test_capigeosminimumrectangle_group("capi::GEOSMinimumRectangle");
//
// Test Cases
diff --git a/tests/unit/capi/GEOSOrientationIndex.cpp b/tests/unit/capi/GEOSOrientationIndexTest.cpp
similarity index 100%
rename from tests/unit/capi/GEOSOrientationIndex.cpp
rename to tests/unit/capi/GEOSOrientationIndexTest.cpp
diff --git a/tests/unit/geom/Geometry/clone.cpp b/tests/unit/geom/Geometry/cloneTest.cpp
similarity index 100%
rename from tests/unit/geom/Geometry/clone.cpp
rename to tests/unit/geom/Geometry/cloneTest.cpp
diff --git a/tests/unit/geom/Geometry/normalize.cpp b/tests/unit/geom/Geometry/normalizeTest.cpp
similarity index 100%
rename from tests/unit/geom/Geometry/normalize.cpp
rename to tests/unit/geom/Geometry/normalizeTest.cpp
diff --git a/tests/unit/linearref/LengthIndexedLineTest.cpp b/tests/unit/linearref/LengthIndexedLineTest.cpp
index 875f567..2fd9034 100644
--- a/tests/unit/linearref/LengthIndexedLineTest.cpp
+++ b/tests/unit/linearref/LengthIndexedLineTest.cpp
@@ -153,7 +153,7 @@ struct test_lengthindexedline_data {
typedef test_group<test_lengthindexedline_data> group;
typedef group::object object;
-group test_lengthindexedline_group("geos::linearref::LocationIndexedLine");
+group test_lengthindexedline_group("geos::linearref::LengthIndexedLine");
// testML
template<>
diff --git a/tests/unit/noding/OrientedCoordinateArray.cpp b/tests/unit/noding/OrientedCoordinateArrayTest.cpp
similarity index 100%
rename from tests/unit/noding/OrientedCoordinateArray.cpp
rename to tests/unit/noding/OrientedCoordinateArrayTest.cpp
diff --git a/tests/unit/operation/union/CascadedPolygonUnionTest.cpp b/tests/unit/operation/geounion/CascadedPolygonUnionTest.cpp
similarity index 100%
rename from tests/unit/operation/union/CascadedPolygonUnionTest.cpp
rename to tests/unit/operation/geounion/CascadedPolygonUnionTest.cpp
diff --git a/tests/unit/operation/union/CoverageUnionTest.cpp b/tests/unit/operation/geounion/CoverageUnionTest.cpp
similarity index 100%
rename from tests/unit/operation/union/CoverageUnionTest.cpp
rename to tests/unit/operation/geounion/CoverageUnionTest.cpp
diff --git a/tests/unit/operation/union/UnaryUnionOpTest.cpp b/tests/unit/operation/geounion/UnaryUnionOpTest.cpp
similarity index 100%
rename from tests/unit/operation/union/UnaryUnionOpTest.cpp
rename to tests/unit/operation/geounion/UnaryUnionOpTest.cpp
diff --git a/tests/unit/operation/overlay/OverlayOpUnionTest.cpp b/tests/unit/operation/overlay/OverlayOpUnionTest.cpp
index ff2abb9..672d008 100644
--- a/tests/unit/operation/overlay/OverlayOpUnionTest.cpp
+++ b/tests/unit/operation/overlay/OverlayOpUnionTest.cpp
@@ -31,7 +31,7 @@ struct test_overlayopunion_data {
typedef test_group<test_overlayopunion_data> group;
typedef group::object object;
-group test_overlayopunion_group("geos::operation::OverlayOp::UNION");
+group test_overlayopunion_group("geos::operation::overlay::OverlayOpUnion");
//
// Test Cases
diff --git a/tests/unit/operation/polygonize/PolygonizeTest.cpp b/tests/unit/operation/polygonize/PolygonizeTest.cpp
index 933dcc2..62a35a5 100644
--- a/tests/unit/operation/polygonize/PolygonizeTest.cpp
+++ b/tests/unit/operation/polygonize/PolygonizeTest.cpp
@@ -144,7 +144,7 @@ struct test_polygonizetest_data {
typedef test_group<test_polygonizetest_data> group;
typedef group::object object;
-group test_polygonizetest_group("geos::operation::polygonize::Polygonizer");
+group test_polygonizetest_group("geos::operation::polygonize::Polygonize");
// test1() in JTS
template<>
diff --git a/tests/unit/operation/valid/IsValidTest.cpp b/tests/unit/operation/valid/IsValidOpTest.cpp
similarity index 100%
rename from tests/unit/operation/valid/IsValidTest.cpp
rename to tests/unit/operation/valid/IsValidOpTest.cpp
commit e9ca63a3a3d2243bcdadcc5cd591917268482a82
Author: Daniel Baston <dbaston at gmail.com>
Date: Wed Sep 18 22:39:58 2019 -0400
Make geos_unit return 1 when called with non-existent test name
diff --git a/tests/unit/geos_unit.cpp b/tests/unit/geos_unit.cpp
index e4cf7c5..d5a5118 100644
--- a/tests/unit/geos_unit.cpp
+++ b/tests/unit/geos_unit.cpp
@@ -103,6 +103,7 @@ main(int argc, const char* argv[])
}
catch(const std::exception& ex) {
std::cerr << "!!! GEOS Test Suite raised exception: " << ex.what() << std::endl;
+ return EXIT_FAILURE;
}
// XXX - mloskot - this should be removed in future!
-----------------------------------------------------------------------
Summary of changes:
tests/unit/CMakeLists.txt | 3 +++
tests/unit/algorithm/CGAlgorithms/computeOrientationTest.cpp | 2 +-
tests/unit/algorithm/CGAlgorithms/isCCWTest.cpp | 2 +-
tests/unit/algorithm/CGAlgorithms/isPointInRingTest.cpp | 2 +-
tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp | 2 +-
tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp | 2 +-
tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp | 2 +-
tests/unit/capi/{GEOSBuildArea.cpp => GEOSBuildAreaTest.cpp} | 0
tests/unit/capi/GEOSCAPIDefinesTest.cpp | 2 +-
...GEOSGeom_createCollection.cpp => GEOSGeom_createCollectionTest.cpp} | 0
tests/unit/capi/{GEOSGeom_create.cpp => GEOSGeom_createTest.cpp} | 0
tests/unit/capi/GEOSGeom_extentTest.cpp | 2 +-
tests/unit/capi/GEOSLineString_PointTest.cpp | 2 +-
tests/unit/capi/{GEOSMakeValid.cpp => GEOSMakeValidTest.cpp} | 0
tests/unit/capi/GEOSMinimumRectangleTest.cpp | 2 +-
.../capi/{GEOSOrientationIndex.cpp => GEOSOrientationIndexTest.cpp} | 0
tests/unit/geom/Geometry/{clone.cpp => cloneTest.cpp} | 0
tests/unit/geom/Geometry/{normalize.cpp => normalizeTest.cpp} | 0
tests/unit/geos_unit.cpp | 1 +
tests/unit/linearref/LengthIndexedLineTest.cpp | 2 +-
.../{OrientedCoordinateArray.cpp => OrientedCoordinateArrayTest.cpp} | 0
tests/unit/operation/{union => geounion}/CascadedPolygonUnionTest.cpp | 0
tests/unit/operation/{union => geounion}/CoverageUnionTest.cpp | 0
tests/unit/operation/{union => geounion}/UnaryUnionOpTest.cpp | 0
tests/unit/operation/overlay/OverlayOpUnionTest.cpp | 2 +-
tests/unit/operation/polygonize/PolygonizeTest.cpp | 2 +-
tests/unit/operation/valid/{IsValidTest.cpp => IsValidOpTest.cpp} | 0
27 files changed, 17 insertions(+), 13 deletions(-)
rename tests/unit/capi/{GEOSBuildArea.cpp => GEOSBuildAreaTest.cpp} (100%)
rename tests/unit/capi/{GEOSGeom_createCollection.cpp => GEOSGeom_createCollectionTest.cpp} (100%)
rename tests/unit/capi/{GEOSGeom_create.cpp => GEOSGeom_createTest.cpp} (100%)
rename tests/unit/capi/{GEOSMakeValid.cpp => GEOSMakeValidTest.cpp} (100%)
rename tests/unit/capi/{GEOSOrientationIndex.cpp => GEOSOrientationIndexTest.cpp} (100%)
rename tests/unit/geom/Geometry/{clone.cpp => cloneTest.cpp} (100%)
rename tests/unit/geom/Geometry/{normalize.cpp => normalizeTest.cpp} (100%)
rename tests/unit/noding/{OrientedCoordinateArray.cpp => OrientedCoordinateArrayTest.cpp} (100%)
rename tests/unit/operation/{union => geounion}/CascadedPolygonUnionTest.cpp (100%)
rename tests/unit/operation/{union => geounion}/CoverageUnionTest.cpp (100%)
rename tests/unit/operation/{union => geounion}/UnaryUnionOpTest.cpp (100%)
rename tests/unit/operation/valid/{IsValidTest.cpp => IsValidOpTest.cpp} (100%)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list