[geos-commits] [SCM] GEOS branch main updated. bfe64bd74a6d79bdf30eed7adc0ecc8f14d210e4
git at osgeo.org
git at osgeo.org
Wed May 24 14:37:19 PDT 2023
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, main has been updated
via bfe64bd74a6d79bdf30eed7adc0ecc8f14d210e4 (commit)
from 66b552abbb4586b68cc298ff2e2bc16420fa7c18 (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 bfe64bd74a6d79bdf30eed7adc0ecc8f14d210e4
Author: Mike Taves <mwtoews at gmail.com>
Date: Thu May 25 09:36:27 2023 +1200
TST: swap "ensure_equals(y,x)" to correct "ensure_equals(x,y)"
diff --git a/tests/unit/io/GeoJSONFeatureTest.cpp b/tests/unit/io/GeoJSONFeatureTest.cpp
index f76469b57..06f2f3820 100644
--- a/tests/unit/io/GeoJSONFeatureTest.cpp
+++ b/tests/unit/io/GeoJSONFeatureTest.cpp
@@ -51,14 +51,14 @@ void object::test<1>
{"id", geos::io::GeoJSONValue(1.0) },
{"name", geos::io::GeoJSONValue(std::string{"One"}) },
}};
- ensure_equals("POINT (-117.000 33.000)", feature.getGeometry()->toText());
- ensure_equals(1.0, feature.getProperties().at("id").getNumber());
- ensure_equals("One", feature.getProperties().at("name").getString());
+ ensure_equals(feature.getGeometry()->toText(), "POINT (-117.000 33.000)");
+ ensure_equals(feature.getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(feature.getProperties().at("name").getString(), "One");
const geos::io::GeoJSONFeature feature2 = feature;
- ensure_equals("POINT (-117.000 33.000)", feature2.getGeometry()->toText());
- ensure_equals(1.0, feature2.getProperties().at("id").getNumber());
- ensure_equals("One", feature2.getProperties().at("name").getString());
+ ensure_equals(feature2.getGeometry()->toText(), "POINT (-117.000 33.000)");
+ ensure_equals(feature2.getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(feature2.getProperties().at("name").getString(), "One");
}
// Write a GeoJSON FeatureCollection
@@ -78,12 +78,12 @@ void object::test<2>
}}
}};
ensure_equals(static_cast<size_t>(2), features.getFeatures().size());
- ensure_equals("POINT (-117.000 33.000)", features.getFeatures()[0].getGeometry()->toText());
- ensure_equals(1.0, features.getFeatures()[0].getProperties().at("id").getNumber());
- ensure_equals("One", features.getFeatures()[0].getProperties().at("name").getString());
- ensure_equals("POINT (-127.000 53.000)", features.getFeatures()[1].getGeometry()->toText());
- ensure_equals(2.0, features.getFeatures()[1].getProperties().at("id").getNumber());
- ensure_equals("Two", features.getFeatures()[1].getProperties().at("name").getString());
+ ensure_equals(features.getFeatures()[0].getGeometry()->toText(), "POINT (-117.000 33.000)");
+ ensure_equals(features.getFeatures()[0].getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(features.getFeatures()[0].getProperties().at("name").getString(), "One");
+ ensure_equals(features.getFeatures()[1].getGeometry()->toText(), "POINT (-127.000 53.000)");
+ ensure_equals(features.getFeatures()[1].getProperties().at("id").getNumber(), 2.0);
+ ensure_equals(features.getFeatures()[1].getProperties().at("name").getString(), "Two");
}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/io/GeoJSONReaderTest.cpp b/tests/unit/io/GeoJSONReaderTest.cpp
index 230d6349f..0f43b9e5b 100644
--- a/tests/unit/io/GeoJSONReaderTest.cpp
+++ b/tests/unit/io/GeoJSONReaderTest.cpp
@@ -52,7 +52,7 @@ void object::test<1>
{
std::string geojson { "{\"type\":\"Point\",\"coordinates\":[-117.0,33.0]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POINT (-117.000 33.000)", geom->toText());
+ ensure_equals(geom->toText(), "POINT (-117.000 33.000)");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -64,7 +64,7 @@ void object::test<2>
{
std::string geojson { "{\"type\":\"LineString\",\"coordinates\":[[102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("LINESTRING (102.000 0.000, 103.000 1.000, 104.000 0.000, 105.000 1.000)", geom->toText());
+ ensure_equals(geom->toText(), "LINESTRING (102.000 0.000, 103.000 1.000, 104.000 0.000, 105.000 1.000)");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -76,7 +76,7 @@ void object::test<3>
{
std::string geojson { "{\"type\":\"Polygon\",\"coordinates\":[[[30,10],[40,40],[20,40],[10,20],[30,10]]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POLYGON ((30.000 10.000, 40.000 40.000, 20.000 40.000, 10.000 20.000, 30.000 10.000))", geom->toText());
+ ensure_equals(geom->toText(), "POLYGON ((30.000 10.000, 40.000 40.000, 20.000 40.000, 10.000 20.000, 30.000 10.000))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -88,7 +88,7 @@ void object::test<4>
{
std::string geojson { "{\"type\":\"Polygon\",\"coordinates\":[[[35,10],[45,45],[15,40],[10,20],[35,10]],[[20,30],[35,35],[30,20],[20,30]]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POLYGON ((35.000 10.000, 45.000 45.000, 15.000 40.000, 10.000 20.000, 35.000 10.000), (20.000 30.000, 35.000 35.000, 30.000 20.000, 20.000 30.000))", geom->toText());
+ ensure_equals(geom->toText(), "POLYGON ((35.000 10.000, 45.000 45.000, 15.000 40.000, 10.000 20.000, 35.000 10.000), (20.000 30.000, 35.000 35.000, 30.000 20.000, 20.000 30.000))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -100,7 +100,7 @@ void object::test<5>
{
std::string geojson { "{\"type\":\"MultiPoint\",\"coordinates\":[[10, 40], [40, 30], [20, 20], [30, 10]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTIPOINT ((10.000 40.000), (40.000 30.000), (20.000 20.000), (30.000 10.000))", geom->toText());
+ ensure_equals(geom->toText(), "MULTIPOINT ((10.000 40.000), (40.000 30.000), (20.000 20.000), (30.000 10.000))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -112,7 +112,7 @@ void object::test<6>
{
std::string geojson { "{\"type\":\"MultiLineString\",\"coordinates\":[[[10, 10], [20, 20], [10, 40]],[[40, 40], [30, 30], [40, 20], [30, 10]]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTILINESTRING ((10.000 10.000, 20.000 20.000, 10.000 40.000), (40.000 40.000, 30.000 30.000, 40.000 20.000, 30.000 10.000))", geom->toText());
+ ensure_equals(geom->toText(), "MULTILINESTRING ((10.000 10.000, 20.000 20.000, 10.000 40.000), (40.000 40.000, 30.000 30.000, 40.000 20.000, 30.000 10.000))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -124,7 +124,7 @@ void object::test<7>
{
std::string geojson { "{\"type\": \"MultiPolygon\", \"coordinates\": [[[[40, 40], [20, 45], [45, 30], [40, 40]]], [[[20, 35], [10, 30], [10, 10], [30, 5], [45, 20], [20, 35]], [[30, 20], [20, 15], [20, 25], [30, 20]]]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTIPOLYGON (((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)), ((20.000 35.000, 10.000 30.000, 10.000 10.000, 30.000 5.000, 45.000 20.000, 20.000 35.000), (30.000 20.000, 20.000 15.000, 20.000 25.000, 30.000 20.000)))", geom->toText());
+ ensure_equals(geom->toText(), "MULTIPOLYGON (((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)), ((20.000 35.000, 10.000 30.000, 10.000 10.000, 30.000 5.000, 45.000 20.000, 20.000 35.000), (30.000 20.000, 20.000 15.000, 20.000 25.000, 30.000 20.000)))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -136,7 +136,7 @@ void object::test<8>
{
std::string geojson { "{\"type\": \"GeometryCollection\",\"geometries\": [{\"type\": \"Point\",\"coordinates\": [40, 10]},{\"type\": \"LineString\",\"coordinates\": [[10, 10], [20, 20], [10, 40]]},{\"type\": \"Polygon\",\"coordinates\": [[[40, 40], [20, 45], [45, 30], [40, 40]]]}]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("GEOMETRYCOLLECTION (POINT (40.000 10.000), LINESTRING (10.000 10.000, 20.000 20.000, 10.000 40.000), POLYGON ((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)))", geom->toText());
+ ensure_equals(geom->toText(), "GEOMETRYCOLLECTION (POINT (40.000 10.000), LINESTRING (10.000 10.000, 20.000 20.000, 10.000 40.000), POLYGON ((40.000 40.000, 20.000 45.000, 45.000 30.000, 40.000 40.000)))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -148,7 +148,7 @@ void object::test<9>
{
std::string geojson { "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-117.0,33.0]}}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POINT (-117.000 33.000)", geom->toText());
+ ensure_equals(geom->toText(), "POINT (-117.000 33.000)");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -160,7 +160,7 @@ void object::test<10>
{
std::string geojson { "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-117.0,33.0]}},{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-122.0,45.0]}}]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("GEOMETRYCOLLECTION (POINT (-117.000 33.000), POINT (-122.000 45.000))", geom->toText());
+ ensure_equals(geom->toText(), "GEOMETRYCOLLECTION (POINT (-117.000 33.000), POINT (-122.000 45.000))");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -172,7 +172,7 @@ void object::test<11>
{
std::string geojson { "{\"type\":\"Point\",\"coordinates\":[]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POINT EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "POINT EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -184,7 +184,7 @@ void object::test<12>
{
std::string geojson { "{\"type\":\"LineString\",\"coordinates\":[]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("LINESTRING EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "LINESTRING EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -196,7 +196,7 @@ void object::test<13>
{
std::string geojson { "{\"type\":\"Polygon\",\"coordinates\":[]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POLYGON EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "POLYGON EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -208,7 +208,7 @@ void object::test<14>
{
std::string geojson { "{\"type\":\"MultiPoint\",\"coordinates\":[]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTIPOINT EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "MULTIPOINT EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -220,7 +220,7 @@ void object::test<15>
{
std::string geojson { "{\"type\":\"MultiLineString\",\"coordinates\":[]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTILINESTRING EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "MULTILINESTRING EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -232,7 +232,7 @@ void object::test<16>
{
std::string geojson { "{\"type\": \"MultiPolygon\", \"coordinates\": []}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTIPOLYGON EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "MULTIPOLYGON EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -244,7 +244,7 @@ void object::test<17>
{
std::string geojson { "{\"type\": \"GeometryCollection\",\"geometries\": []}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("GEOMETRYCOLLECTION EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "GEOMETRYCOLLECTION EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -256,12 +256,12 @@ void object::test<18>
{
std::string geojson { "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-117.0,33.0]}, \"properties\": {\"id\": 1, \"name\": \"one\", \"required\": true} }" };
geos::io::GeoJSONFeatureCollection features(geojsonreader.readFeatures(geojson));
- ensure_equals(static_cast<size_t>(1), features.getFeatures().size());
+ ensure_equals(features.getFeatures().size(), static_cast<size_t>(1));
ensure_equals(static_cast<size_t>(features.getFeatures()[0].getGeometry()->getCoordinateDimension()), 2u);
- ensure_equals("POINT (-117.000 33.000)", features.getFeatures()[0].getGeometry()->toText());
- ensure_equals(1.0, features.getFeatures()[0].getProperties().at("id").getNumber());
- ensure_equals("one", features.getFeatures()[0].getProperties().at("name").getString());
- ensure_equals(true, features.getFeatures()[0].getProperties().at("required").getBoolean());
+ ensure_equals(features.getFeatures()[0].getGeometry()->toText(), "POINT (-117.000 33.000)");
+ ensure_equals(features.getFeatures()[0].getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(features.getFeatures()[0].getProperties().at("name").getString(), "one");
+ ensure_equals(features.getFeatures()[0].getProperties().at("required").getBoolean(), true);
}
// Read a Complicated Feature
@@ -272,17 +272,17 @@ void object::test<19>
{
std::string geojson { "{\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":[-117.0,33.0]}, \"properties\": {\"id\": 1, \"name\": \"one\", \"items\": [1,2,3,4], \"nested\": {\"id\":2, \"name\":\"two\"}}}" };
geos::io::GeoJSONFeatureCollection features(geojsonreader.readFeatures(geojson));
- ensure_equals(static_cast<size_t>(1), features.getFeatures().size());
+ ensure_equals(features.getFeatures().size(), static_cast<size_t>(1));
ensure_equals(static_cast<size_t>(features.getFeatures()[0].getGeometry()->getCoordinateDimension()), 2u);
- ensure_equals("POINT (-117.000 33.000)", features.getFeatures()[0].getGeometry()->toText());
- ensure_equals(1.0, features.getFeatures()[0].getProperties().at("id").getNumber());
- ensure_equals("one", features.getFeatures()[0].getProperties().at("name").getString());
+ ensure_equals(features.getFeatures()[0].getGeometry()->toText(), "POINT (-117.000 33.000)");
+ ensure_equals(features.getFeatures()[0].getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(features.getFeatures()[0].getProperties().at("name").getString(), "one");
std::vector<geos::io::GeoJSONValue> values = features.getFeatures()[0].getProperties().at("items").getArray();
- ensure_equals(static_cast<size_t>(4), values.size());
- ensure_equals(1.0, values[0].getNumber());
- ensure_equals(2.0, values[1].getNumber());
- ensure_equals(3.0, values[2].getNumber());
- ensure_equals(4.0, values[3].getNumber());
+ ensure_equals(values.size(), static_cast<size_t>(4));
+ ensure_equals(values[0].getNumber(), 1.0);
+ ensure_equals(values[1].getNumber(), 2.0);
+ ensure_equals(values[2].getNumber(), 3.0);
+ ensure_equals(values[3].getNumber(), 4.0);
}
// Read a FeatureCollection
@@ -297,14 +297,14 @@ void object::test<20>
"{\"type\":\"Feature\",\"properties\":{\"id\": 3},\"geometry\":{\"type\":\"Point\",\"coordinates\":[-28.125,39.095]}}"
"]}" };
geos::io::GeoJSONFeatureCollection features(geojsonreader.readFeatures(geojson));
- ensure_equals(static_cast<size_t>(3), features.getFeatures().size());
+ ensure_equals(features.getFeatures().size(), static_cast<size_t>(3));
ensure_equals(static_cast<size_t>(features.getFeatures()[0].getGeometry()->getCoordinateDimension()), 2u);
- ensure_equals("POLYGON ((87.890 64.923, 76.992 55.178, 102.656 46.558, 115.312 60.413, 94.570 58.447, 87.890 64.923))", features.getFeatures()[0].getGeometry()->toText());
- ensure_equals(1.0, features.getFeatures()[0].getProperties().at("id").getNumber());
- ensure_equals("LINESTRING (1.406 48.690, 41.835 34.016, 22.500 13.923)", features.getFeatures()[1].getGeometry()->toText());
- ensure_equals(2.0, features.getFeatures()[1].getProperties().at("id").getNumber());
- ensure_equals("POINT (-28.125 39.095)", features.getFeatures()[2].getGeometry()->toText());
- ensure_equals(3.0, features.getFeatures()[2].getProperties().at("id").getNumber());
+ ensure_equals(features.getFeatures()[0].getGeometry()->toText(), "POLYGON ((87.890 64.923, 76.992 55.178, 102.656 46.558, 115.312 60.413, 94.570 58.447, 87.890 64.923))");
+ ensure_equals(features.getFeatures()[0].getProperties().at("id").getNumber(), 1.0);
+ ensure_equals(features.getFeatures()[1].getGeometry()->toText(), "LINESTRING (1.406 48.690, 41.835 34.016, 22.500 13.923)");
+ ensure_equals(features.getFeatures()[1].getProperties().at("id").getNumber(), 2.0);
+ ensure_equals(features.getFeatures()[2].getGeometry()->toText(), "POINT (-28.125 39.095)");
+ ensure_equals(features.getFeatures()[2].getProperties().at("id").getNumber(), 3.0);
}
// Read a GeoJSON Polygon with an empty ring
@@ -315,7 +315,7 @@ void object::test<21>
{
std::string geojson { "{\"type\":\"Polygon\",\"coordinates\":[[]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POLYGON EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "POLYGON EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -335,7 +335,7 @@ void object::test<22>
errorMessage = e.what();
}
ensure(error == true);
- ensure_equals("ParseException: Expected two coordinates found one", errorMessage);
+ ensure_equals(errorMessage, "ParseException: Expected two coordinates found one");
}
// Throw ParseException for bad GeoJSON
@@ -373,7 +373,7 @@ void object::test<24>
errorMessage = e.what();
}
ensure(error == true);
- ensure_equals("ParseException: Expected two coordinates found one", errorMessage);
+ ensure_equals(errorMessage, "ParseException: Expected two coordinates found one");
}
// Throw error when geometry type is unsupported
@@ -392,7 +392,7 @@ void object::test<25>
errorMessage = e.what();
}
ensure(error == true);
- ensure_equals("ParseException: Unknown geometry type!", errorMessage);
+ ensure_equals(errorMessage, "ParseException: Unknown geometry type!");
}
// Throw error when LINESTRING has only one coordinate
@@ -411,7 +411,7 @@ void object::test<26>
errorMessage = e.what();
}
ensure(error == true);
- ensure_equals("ParseException: Expected two coordinates found one", errorMessage);
+ ensure_equals(errorMessage, "ParseException: Expected two coordinates found one");
}
// Read a GeoJSON empty Polygon with empty shell and empty inner rings
@@ -422,7 +422,7 @@ void object::test<27>
{
std::string geojson { "{\"type\":\"Polygon\",\"coordinates\":[[],[]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("POLYGON EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "POLYGON EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -434,7 +434,7 @@ void object::test<28>
{
std::string geojson { "{\"type\":\"MultiLineString\",\"coordinates\":[[],[],[]]}" };
GeomPtr geom(geojsonreader.read(geojson));
- ensure_equals("MULTILINESTRING EMPTY", geom->toText());
+ ensure_equals(geom->toText(), "MULTILINESTRING EMPTY");
ensure_equals(static_cast<size_t>(geom->getCoordinateDimension()), 2u);
}
@@ -454,7 +454,7 @@ void object::test<29>
errorMessage = e.what();
}
ensure(error == true);
- ensure_equals("ParseException: Expected two coordinates found more than two", errorMessage);
+ ensure_equals(errorMessage, "ParseException: Expected two coordinates found more than two");
}
// Throw ParseException for bad GeoJSON
-----------------------------------------------------------------------
Summary of changes:
tests/unit/io/GeoJSONFeatureTest.cpp | 26 +++++-----
tests/unit/io/GeoJSONReaderTest.cpp | 92 ++++++++++++++++++------------------
2 files changed, 59 insertions(+), 59 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list