diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/test_c_api.cpp | 159 | ||||
| -rw-r--r-- | test/unit/test_crs.cpp | 5 | ||||
| -rw-r--r-- | test/unit/test_defmodel.cpp | 31 | ||||
| -rw-r--r-- | test/unit/test_factory.cpp | 41 | ||||
| -rw-r--r-- | test/unit/test_io.cpp | 69 | ||||
| -rw-r--r-- | test/unit/test_network.cpp | 59 | ||||
| -rw-r--r-- | test/unit/test_operation.cpp | 57 | ||||
| -rw-r--r-- | test/unit/test_operationfactory.cpp | 42 |
8 files changed, 259 insertions, 204 deletions
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index b67ff6d1..26e4eae2 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -298,15 +298,16 @@ TEST_F(CApi, proj_create_from_wkt) { PROJ_STRING_LIST warningList = nullptr; PROJ_STRING_LIST errorList = nullptr; auto obj = proj_create_from_wkt( - m_ctxt, "PROJCS[\"test\",\n" - " GEOGCS[\"WGS 84\",\n" - " DATUM[\"WGS_1984\",\n" - " SPHEROID[\"WGS 84\",6378137,298.257223563]],\n" - " PRIMEM[\"Greenwich\",0],\n" - " UNIT[\"degree\",0.0174532925199433]],\n" - " PROJECTION[\"Transverse_Mercator\"],\n" - " PARAMETER[\"latitude_of_origin\",31],\n" - " UNIT[\"metre\",1]]", + m_ctxt, + "PROJCS[\"test\",\n" + " GEOGCS[\"WGS 84\",\n" + " DATUM[\"WGS_1984\",\n" + " SPHEROID[\"WGS 84\",6378137,298.257223563]],\n" + " PRIMEM[\"Greenwich\",0],\n" + " UNIT[\"degree\",0.0174532925199433]],\n" + " PROJECTION[\"Transverse_Mercator\"],\n" + " PARAMETER[\"latitude_of_origin\",31],\n" + " UNIT[\"metre\",1]]", nullptr, &warningList, &errorList); ObjectKeeper keeper(obj); EXPECT_NE(obj, nullptr); @@ -317,15 +318,16 @@ TEST_F(CApi, proj_create_from_wkt) { } { auto obj = proj_create_from_wkt( - m_ctxt, "PROJCS[\"test\",\n" - " GEOGCS[\"WGS 84\",\n" - " DATUM[\"WGS_1984\",\n" - " SPHEROID[\"WGS 84\",6378137,298.257223563]],\n" - " PRIMEM[\"Greenwich\",0],\n" - " UNIT[\"degree\",0.0174532925199433]],\n" - " PROJECTION[\"Transverse_Mercator\"],\n" - " PARAMETER[\"latitude_of_origin\",31],\n" - " UNIT[\"metre\",1]]", + m_ctxt, + "PROJCS[\"test\",\n" + " GEOGCS[\"WGS 84\",\n" + " DATUM[\"WGS_1984\",\n" + " SPHEROID[\"WGS 84\",6378137,298.257223563]],\n" + " PRIMEM[\"Greenwich\",0],\n" + " UNIT[\"degree\",0.0174532925199433]],\n" + " PROJECTION[\"Transverse_Mercator\"],\n" + " PARAMETER[\"latitude_of_origin\",31],\n" + " UNIT[\"metre\",1]]", nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); EXPECT_NE(obj, nullptr); @@ -466,9 +468,10 @@ TEST_F(CApi, proj_as_wkt) { TEST_F(CApi, proj_as_wkt_check_db_use) { auto obj = proj_create_from_wkt( - m_ctxt, "GEOGCS[\"AGD66\",DATUM[\"Australian_Geodetic_Datum_1966\"," - "SPHEROID[\"Australian National Spheroid\",6378160,298.25]]," - "PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]", + m_ctxt, + "GEOGCS[\"AGD66\",DATUM[\"Australian_Geodetic_Datum_1966\"," + "SPHEROID[\"Australian National Spheroid\",6378160,298.25]]," + "PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]", nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); @@ -691,41 +694,45 @@ TEST_F(CApi, proj_get_type) { EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEOCENTRIC_CRS); } { - auto obj = proj_create_from_wkt( - m_ctxt, GeographicCRS::EPSG_4326->datum() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + GeographicCRS::EPSG_4326->datum() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_GEODETIC_REFERENCE_FRAME); } { - auto obj = proj_create_from_wkt( - m_ctxt, GeographicCRS::EPSG_4326->ellipsoid() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + GeographicCRS::EPSG_4326->ellipsoid() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_ELLIPSOID); } { - auto obj = proj_create_from_wkt( - m_ctxt, createProjectedCRS() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createProjectedCRS() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_PROJECTED_CRS); } { - auto obj = proj_create_from_wkt( - m_ctxt, createVerticalCRS() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createVerticalCRS() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_VERTICAL_CRS); @@ -756,23 +763,25 @@ TEST_F(CApi, proj_get_type) { EXPECT_EQ(proj_get_type(datum), PJ_TYPE_PARAMETRIC_DATUM); } { - auto obj = proj_create_from_wkt( - m_ctxt, createVerticalCRS() - ->datum() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createVerticalCRS() + ->datum() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_VERTICAL_REFERENCE_FRAME); } { - auto obj = proj_create_from_wkt( - m_ctxt, createProjectedCRS() - ->derivingConversion() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createProjectedCRS() + ->derivingConversion() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_CONVERSION); @@ -787,12 +796,13 @@ TEST_F(CApi, proj_get_type) { EXPECT_EQ(proj_get_type(obj), PJ_TYPE_BOUND_CRS); } { - auto obj = proj_create_from_wkt( - m_ctxt, createBoundCRS() - ->transformation() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createBoundCRS() + ->transformation() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ObjectKeeper keeper(obj); ASSERT_NE(obj, nullptr); EXPECT_EQ(proj_get_type(obj), PJ_TYPE_TRANSFORMATION); @@ -1092,12 +1102,13 @@ TEST_F(CApi, proj_get_source_target_crs_bound_crs) { // --------------------------------------------------------------------------- TEST_F(CApi, proj_get_source_target_crs_transformation) { - auto obj = proj_create_from_wkt( - m_ctxt, createBoundCRS() - ->transformation() - ->exportToWKT(WKTFormatter::create().get()) - .c_str(), - nullptr, nullptr, nullptr); + auto obj = + proj_create_from_wkt(m_ctxt, + createBoundCRS() + ->transformation() + ->exportToWKT(WKTFormatter::create().get()) + .c_str(), + nullptr, nullptr, nullptr); ASSERT_NE(obj, nullptr); ObjectKeeper keeper(obj); @@ -3975,8 +3986,8 @@ TEST_F(CApi, proj_as_projjson) { "}"); } { - const char *const options[] = {"INDENTATION_WIDTH=4", "SCHEMA=", - nullptr}; + const char *const options[] = {"INDENTATION_WIDTH=4", + "SCHEMA=", nullptr}; auto projjson = proj_as_projjson(m_ctxt, obj, options); ASSERT_NE(projjson, nullptr); EXPECT_EQ(std::string(projjson), @@ -4046,9 +4057,10 @@ struct Fixture_proj_context_set_autoclose_database : public CApi { sqlite3_open_v2(tmp_filename.c_str(), &db, SQLITE_OPEN_READWRITE, nullptr); ASSERT_NE(db, nullptr); - ASSERT_TRUE(sqlite3_exec(db, "UPDATE geodetic_crs SET name = 'foo' " - "WHERE auth_name = 'EPSG' and code = " - "'4326'", + ASSERT_TRUE(sqlite3_exec(db, + "UPDATE geodetic_crs SET name = 'foo' " + "WHERE auth_name = 'EPSG' and code = " + "'4326'", nullptr, nullptr, nullptr) == SQLITE_OK); sqlite3_close(db); } @@ -4068,9 +4080,10 @@ struct Fixture_proj_context_set_autoclose_database : public CApi { sqlite3_open_v2(tmp_filename.c_str(), &db, SQLITE_OPEN_READWRITE, nullptr); ASSERT_NE(db, nullptr); - ASSERT_TRUE(sqlite3_exec(db, "UPDATE geodetic_crs SET name = 'bar' " - "WHERE auth_name = 'EPSG' and code = " - "'4326'", + ASSERT_TRUE(sqlite3_exec(db, + "UPDATE geodetic_crs SET name = 'bar' " + "WHERE auth_name = 'EPSG' and code = " + "'4326'", nullptr, nullptr, nullptr) == SQLITE_OK); sqlite3_close(db); } diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp index 3d0a108a..5ff4dd2d 100644 --- a/test/unit/test_crs.cpp +++ b/test/unit/test_crs.cpp @@ -5511,8 +5511,9 @@ static ParametricCSNNPtr createParametricCS() { PropertyMap(), CoordinateSystemAxis::create( PropertyMap().set(IdentifiedObject::NAME_KEY, "pressure"), "hPa", - AxisDirection::UP, UnitOfMeasure("HectoPascal", 100, - UnitOfMeasure::Type::PARAMETRIC))); + AxisDirection::UP, + UnitOfMeasure("HectoPascal", 100, + UnitOfMeasure::Type::PARAMETRIC))); } // --------------------------------------------------------------------------- diff --git a/test/unit/test_defmodel.cpp b/test/unit/test_defmodel.cpp index ac9da818..16bffcf3 100644 --- a/test/unit/test_defmodel.cpp +++ b/test/unit/test_defmodel.cpp @@ -63,8 +63,8 @@ static json getMinValidContent() { j["target_crs"] = "EPSG:7907"; j["definition_crs"] = "EPSG:4959"; j["extent"]["type"] = "bbox"; - j["extent"] - ["parameters"] = {{"bbox", {modelMinX, modelMinY, modelMaxX, modelMaxY}}}; + j["extent"]["parameters"] = { + {"bbox", {modelMinX, modelMinY, modelMaxX, modelMaxY}}}; j["time_extent"]["first"] = "1900-01-01T00:00:00Z"; j["time_extent"]["last"] = "2050-01-01T00:00:00Z"; j["components"] = json::array(); @@ -124,7 +124,8 @@ static json getFullValidContent() { }}, {"time_function", { - {"type", "constant"}, {"parameters", json::object()}, + {"type", "constant"}, + {"parameters", json::object()}, }}, }}; @@ -848,15 +849,13 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { tValid, newLon, newLat, newZ)); EXPECT_NEAR( RadToDeg(newLon), - lon + - tFactor * (lonOffsetQueriedX + - alphaX * (lonOffsetQueriedXp1 - lonOffsetQueriedX)), + lon + tFactor * (lonOffsetQueriedX + alphaX * (lonOffsetQueriedXp1 - + lonOffsetQueriedX)), EPS); EXPECT_NEAR( RadToDeg(newLat), - lat + - tFactor * (latOffsetQueriedY + - alphaY * (latOffsetQueriedYp1 - latOffsetQueriedY)), + lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 - + latOffsetQueriedY)), EPS); EXPECT_EQ(newZ, zVal); } @@ -1002,15 +1001,13 @@ TEST(defmodel, evaluator_horizontal_unit_degree) { tValid, newLon, newLat, newZ)); EXPECT_NEAR( RadToDeg(newLon), - lon + - tFactor * (lonOffsetQueriedX + - alphaX * (lonOffsetQueriedXp1 - lonOffsetQueriedX)), + lon + tFactor * (lonOffsetQueriedX + alphaX * (lonOffsetQueriedXp1 - + lonOffsetQueriedX)), EPS); EXPECT_NEAR( RadToDeg(newLat), - lat + - tFactor * (latOffsetQueriedY + - alphaY * (latOffsetQueriedYp1 - latOffsetQueriedY)), + lat + tFactor * (latOffsetQueriedY + alphaY * (latOffsetQueriedYp1 - + latOffsetQueriedY)), EPS); const double zBottom = @@ -1391,8 +1388,8 @@ TEST(defmodel, evaluator_projected_crs) { constexpr double gridResX = gridMaxX - gridMinX; constexpr double gridResY = gridMaxY - gridMinY; - j["extent"] - ["parameters"] = {{"bbox", {gridMinX, gridMinY, gridMaxX, gridMaxY}}}; + j["extent"]["parameters"] = { + {"bbox", {gridMinX, gridMinY, gridMaxX, gridMaxY}}}; j["components"] = { {{"displacement_type", "horizontal"}, {"uncertainty_type", "none"}, diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index 7f474dcf..a9bb4e86 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -1794,11 +1794,13 @@ class FactoryWithTmpDatabase : public ::testing::Test { << last_error(); ASSERT_TRUE(execute("INSERT INTO usage VALUES('FOO'," "'geodetic_datum_" + - val + "_usage'," - "'geodetic_datum'," - "'FOO','" + - val + "'," - "'EPSG','1262','EPSG','1024');")) + val + + "_usage'," + "'geodetic_datum'," + "'FOO','" + + val + + "'," + "'EPSG','1262','EPSG','1024');")) << last_error(); ASSERT_TRUE(execute("INSERT INTO geodetic_crs " @@ -1810,9 +1812,10 @@ class FactoryWithTmpDatabase : public ::testing::Test { << last_error(); ASSERT_TRUE(execute("INSERT INTO usage VALUES('FOO'," "'geodetic_crs_" + - val + "_usage'," - "'geodetic_crs'," - "'NS_" + + val + + "_usage'," + "'geodetic_crs'," + "'NS_" + val + "','" + val + "','EPSG','1262','EPSG','1024');")) << last_error(); @@ -1835,11 +1838,13 @@ class FactoryWithTmpDatabase : public ::testing::Test { << last_error(); ASSERT_TRUE(execute("INSERT INTO usage VALUES('OTHER'," "'helmert_transformation" + - src + '_' + dst + "_usage'," - "'helmert_transformation'," - "'OTHER','" + - src + "_" + dst + "'," - "'EPSG','1262','EPSG','1024');")) + src + '_' + dst + + "_usage'," + "'helmert_transformation'," + "'OTHER','" + + src + "_" + dst + + "'," + "'EPSG','1262','EPSG','1024');")) << last_error(); } @@ -1856,16 +1861,18 @@ class FactoryWithTmpDatabase : public ::testing::Test { res = factoryOTHER->createFromCRSCodesWithIntermediates( "NS_SOURCE", "SOURCE", "NS_TARGET", "TARGET", false, false, - false, false, {std::make_pair(std::string("NS_PIVOT"), - std::string("PIVOT"))}); + false, false, + {std::make_pair(std::string("NS_PIVOT"), + std::string("PIVOT"))}); EXPECT_EQ(res.size(), 1U); EXPECT_TRUE(res.empty() || nn_dynamic_pointer_cast<ConcatenatedOperation>(res[0])); res = factoryOTHER->createFromCRSCodesWithIntermediates( "NS_SOURCE", "SOURCE", "NS_TARGET", "TARGET", false, false, - false, false, {std::make_pair(std::string("NS_PIVOT"), - std::string("NOT_EXISTING"))}); + false, false, + {std::make_pair(std::string("NS_PIVOT"), + std::string("NOT_EXISTING"))}); EXPECT_EQ(res.size(), 0U); res = factoryOTHER->createFromCRSCodesWithIntermediates( diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp index 84999b07..f97e6618 100644 --- a/test/unit/test_io.cpp +++ b/test/unit/test_io.cpp @@ -3009,8 +3009,9 @@ TEST(wkt_parse, COORDINATEOPERATION) { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + + src_wkt + + "],\n" + " TARGETCRS[" + dst_wkt + "],\n" " METHOD[\"operationMethodName\",\n" @@ -3083,8 +3084,9 @@ TEST(wkt_parse, COORDINATEOPERATION_wkt2_2019) { "COORDINATEOPERATION[\"transformationName\",\n" " VERSION[\"my version\"],\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + + src_wkt + + "],\n" + " TARGETCRS[" + dst_wkt + "],\n" " METHOD[\"operationMethodName\",\n" @@ -6836,11 +6838,13 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + - dst_wkt + "],\n" - " METHOD[\"operationMethodName\"],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + src_wkt + + "],\n" + " TARGETCRS[" + + dst_wkt + + "],\n" + " METHOD[\"operationMethodName\"],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_NO_THROW(WKTParser().createFromWKT(wkt)); } @@ -6849,9 +6853,10 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " TARGETCRS[" + - dst_wkt + "],\n" - " METHOD[\"operationMethodName\"],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + dst_wkt + + "],\n" + " METHOD[\"operationMethodName\"],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); } @@ -6861,9 +6866,10 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[FOO],\n" " TARGETCRS[" + - dst_wkt + "],\n" - " METHOD[\"operationMethodName\"],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + dst_wkt + + "],\n" + " METHOD[\"operationMethodName\"],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); } @@ -6872,9 +6878,10 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " METHOD[\"operationMethodName\"],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + src_wkt + + "],\n" + " METHOD[\"operationMethodName\"],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); } @@ -6883,10 +6890,11 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[FOO],\n" - " METHOD[\"operationMethodName\"],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + src_wkt + + "],\n" + " TARGETCRS[FOO],\n" + " METHOD[\"operationMethodName\"],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); } @@ -6895,8 +6903,9 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + + src_wkt + + "],\n" + " TARGETCRS[" + dst_wkt + "]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); @@ -6906,11 +6915,13 @@ TEST(wkt_parse, invalid_COORDINATEOPERATION) { { auto wkt = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + - dst_wkt + "],\n" - " METHOD[],\n" - " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; + src_wkt + + "],\n" + " TARGETCRS[" + + dst_wkt + + "],\n" + " METHOD[],\n" + " PARAMETERFILE[\"paramName\",\"foo.bin\"]]"; EXPECT_THROW(WKTParser().createFromWKT(wkt), ParsingException); } diff --git a/test/unit/test_network.cpp b/test/unit/test_network.cpp index db3e987f..8edb7c8c 100644 --- a/test/unit/test_network.cpp +++ b/test/unit/test_network.cpp @@ -275,8 +275,9 @@ static PROJ_NETWORK_HANDLE *open_cbk(PJ_CONTEXT *ctx, const char *url, auto openEvent = dynamic_cast<OpenEvent *>(exchange->events[exchange->nextEvent].get()); if (!openEvent) { - fprintf(stderr, "unexpected call to open(%s, %ld, %ld). " - "Was expecting a %s event\n", + fprintf(stderr, + "unexpected call to open(%s, %ld, %ld). " + "Was expecting a %s event\n", url, (long)offset, (long)size_to_read, exchange->events[exchange->nextEvent]->type.c_str()); exchange->error = true; @@ -286,8 +287,9 @@ static PROJ_NETWORK_HANDLE *open_cbk(PJ_CONTEXT *ctx, const char *url, if (openEvent->ctx != ctx || openEvent->url != url || openEvent->offset != offset || openEvent->size_to_read != size_to_read) { - fprintf(stderr, "wrong call to open(%s, %ld, %ld). Was expecting " - "open(%s, %ld, %ld)\n", + fprintf(stderr, + "wrong call to open(%s, %ld, %ld). Was expecting " + "open(%s, %ld, %ld)\n", url, (long)offset, (long)size_to_read, openEvent->url.c_str(), (long)openEvent->offset, (long)openEvent->size_to_read); exchange->error = true; @@ -319,8 +321,9 @@ static void close_cbk(PJ_CONTEXT *ctx, PROJ_NETWORK_HANDLE *handle, auto closeEvent = dynamic_cast<CloseEvent *>(exchange->events[exchange->nextEvent].get()); if (!closeEvent) { - fprintf(stderr, "unexpected call to close(). " - "Was expecting a %s event\n", + fprintf(stderr, + "unexpected call to close(). " + "Was expecting a %s event\n", exchange->events[exchange->nextEvent]->type.c_str()); exchange->error = true; return; @@ -354,8 +357,9 @@ static const char *get_header_value_cbk(PJ_CONTEXT *ctx, auto getHeaderValueEvent = dynamic_cast<GetHeaderValueEvent *>( exchange->events[exchange->nextEvent].get()); if (!getHeaderValueEvent) { - fprintf(stderr, "unexpected call to get_header_value(). " - "Was expecting a %s event\n", + fprintf(stderr, + "unexpected call to get_header_value(). " + "Was expecting a %s event\n", exchange->events[exchange->nextEvent]->type.c_str()); exchange->error = true; return nullptr; @@ -366,8 +370,9 @@ static const char *get_header_value_cbk(PJ_CONTEXT *ctx, return nullptr; } if (getHeaderValueEvent->key != header_name) { - fprintf(stderr, "wrong call to get_header_value(%s). Was expecting " - "get_header_value(%s)\n", + fprintf(stderr, + "wrong call to get_header_value(%s). Was expecting " + "get_header_value(%s)\n", header_name, getHeaderValueEvent->key.c_str()); exchange->error = true; return nullptr; @@ -397,8 +402,9 @@ static size_t read_range_cbk(PJ_CONTEXT *ctx, PROJ_NETWORK_HANDLE *handle, auto readRangeEvent = dynamic_cast<ReadRangeEvent *>( exchange->events[exchange->nextEvent].get()); if (!readRangeEvent) { - fprintf(stderr, "unexpected call to read_range(). " - "Was expecting a %s event\n", + fprintf(stderr, + "unexpected call to read_range(). " + "Was expecting a %s event\n", exchange->events[exchange->nextEvent]->type.c_str()); exchange->error = true; return 0; @@ -410,8 +416,9 @@ static size_t read_range_cbk(PJ_CONTEXT *ctx, PROJ_NETWORK_HANDLE *handle, } if (readRangeEvent->ctx != ctx || readRangeEvent->offset != offset || readRangeEvent->size_to_read != size_to_read) { - fprintf(stderr, "wrong call to read_range(%ld, %ld). Was expecting " - "read_range(%ld, %ld)\n", + fprintf(stderr, + "wrong call to read_range(%ld, %ld). Was expecting " + "read_range(%ld, %ld)\n", (long)offset, (long)size_to_read, (long)readRangeEvent->offset, (long)readRangeEvent->size_to_read); exchange->error = true; @@ -1308,9 +1315,10 @@ TEST(networking, cache_basic) { SQLITE_OPEN_READONLY, nullptr); ASSERT_NE(hDB, nullptr); sqlite3_stmt *hStmt = nullptr; - sqlite3_prepare_v2(hDB, "SELECT url, offset FROM chunks WHERE id = (" - "SELECT chunk_id FROM linked_chunks WHERE id = (" - "SELECT head FROM linked_chunks_head_tail))", + sqlite3_prepare_v2(hDB, + "SELECT url, offset FROM chunks WHERE id = (" + "SELECT chunk_id FROM linked_chunks WHERE id = (" + "SELECT head FROM linked_chunks_head_tail))", -1, &hStmt, nullptr); ASSERT_NE(hStmt, nullptr); ASSERT_EQ(sqlite3_step(hStmt), SQLITE_ROW); @@ -1429,9 +1437,10 @@ TEST(networking, cache_saturation) { ASSERT_NE(hDB, nullptr); sqlite3_stmt *hStmt = nullptr; - sqlite3_prepare_v2(hDB, "SELECT COUNT(*) FROM chunk_data UNION ALL " - "SELECT COUNT(*) FROM chunks UNION ALL " - "SELECT COUNT(*) FROM linked_chunks", + sqlite3_prepare_v2(hDB, + "SELECT COUNT(*) FROM chunk_data UNION ALL " + "SELECT COUNT(*) FROM chunks UNION ALL " + "SELECT COUNT(*) FROM linked_chunks", -1, &hStmt, nullptr); ASSERT_NE(hStmt, nullptr); ASSERT_EQ(sqlite3_step(hStmt), SQLITE_ROW); @@ -1487,8 +1496,9 @@ TEST(networking, cache_ttl) { // Force lastChecked to the Epoch so that data is expired. sqlite3_stmt *hStmt = nullptr; - sqlite3_prepare_v2(hDB, "UPDATE properties SET lastChecked = 0, " - "lastModified = 'foo', etag = 'bar'", + sqlite3_prepare_v2(hDB, + "UPDATE properties SET lastChecked = 0, " + "lastModified = 'foo', etag = 'bar'", -1, &hStmt, nullptr); ASSERT_NE(hStmt, nullptr); ASSERT_EQ(sqlite3_step(hStmt), SQLITE_DONE); @@ -1724,8 +1734,9 @@ TEST(networking, download_whole_files) { // Now invalid lastModified. This should trigger a new download sqlite3_prepare_v2( - hDB, "UPDATE downloaded_file_properties SET lastChecked = 0, " - "lastModified = 'foo'", + hDB, + "UPDATE downloaded_file_properties SET lastChecked = 0, " + "lastModified = 'foo'", -1, &hStmt, nullptr); ASSERT_NE(hStmt, nullptr); ASSERT_EQ(sqlite3_step(hStmt), SQLITE_DONE); diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp index 74bddee8..6ddbd9f4 100644 --- a/test/unit/test_operation.cpp +++ b/test/unit/test_operation.cpp @@ -370,8 +370,9 @@ TEST(operation, transformation_to_wkt) { auto expected = "COORDINATEOPERATION[\"transformationName\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + + src_wkt + + "],\n" + " TARGETCRS[" + dst_wkt + "],\n" " METHOD[\"operationMethodName\",\n" @@ -472,15 +473,19 @@ TEST(operation, concatenated_operation) { auto expected = "CONCATENATEDOPERATION[\"name\",\n" " SOURCECRS[" + - src_wkt + "],\n" - " TARGETCRS[" + - dst_wkt + "],\n" - " STEP[" + - step1_wkt + "],\n" - " STEP[" + - step2_wkt + "],\n" - " ID[\"codeSpace\",\"code\"],\n" - " REMARK[\"my remarks\"]]"; + src_wkt + + "],\n" + " TARGETCRS[" + + dst_wkt + + "],\n" + " STEP[" + + step1_wkt + + "],\n" + " STEP[" + + step2_wkt + + "],\n" + " ID[\"codeSpace\",\"code\"],\n" + " REMARK[\"my remarks\"]]"; EXPECT_EQ(replaceAll(replaceAll(concat->exportToWKT( WKTFormatter::create( @@ -663,8 +668,9 @@ TEST(operation, transformation_createPositionVector) { auto transf = Transformation::createPositionVector( PropertyMap(), GeographicCRS::EPSG_4269, GeographicCRS::EPSG_4326, 1.0, - 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, std::vector<PositionalAccuracyNNPtr>{ - PositionalAccuracy::create("100")}); + 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, + std::vector<PositionalAccuracyNNPtr>{ + PositionalAccuracy::create("100")}); EXPECT_TRUE(transf->validateParameters().empty()); ASSERT_EQ(transf->coordinateOperationAccuracies().size(), 1U); @@ -4494,8 +4500,9 @@ static GeographicCRSNNPtr geographicCRSInvalidEccentricity() { return GeographicCRS::create( PropertyMap(), GeodeticReferenceFrame::create( - PropertyMap(), Ellipsoid::createFlattenedSphere( - PropertyMap(), Length(6378137), Scale(0.1)), + PropertyMap(), + Ellipsoid::createFlattenedSphere(PropertyMap(), Length(6378137), + Scale(0.1)), optional<std::string>(), PrimeMeridian::GREENWICH), EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE)); } @@ -5300,10 +5307,11 @@ TEST(operation, validateParameters) { } { - auto conv = Conversion::create( - PropertyMap(), PropertyMap().set(IdentifiedObject::NAME_KEY, - "change of vertical unit"), - {}, {}); + auto conv = + Conversion::create(PropertyMap(), + PropertyMap().set(IdentifiedObject::NAME_KEY, + "change of vertical unit"), + {}, {}); auto validation = conv->validateParameters(); auto expected = std::list<std::string>{ "Method name change of vertical unit is equivalent to official " @@ -5314,11 +5322,12 @@ TEST(operation, validateParameters) { { auto conv = Conversion::create( - PropertyMap(), PropertyMap() - .set(IdentifiedObject::NAME_KEY, - EPSG_NAME_METHOD_CHANGE_VERTICAL_UNIT) - .set(Identifier::CODESPACE_KEY, Identifier::EPSG) - .set(Identifier::CODE_KEY, "1234"), + PropertyMap(), + PropertyMap() + .set(IdentifiedObject::NAME_KEY, + EPSG_NAME_METHOD_CHANGE_VERTICAL_UNIT) + .set(Identifier::CODESPACE_KEY, Identifier::EPSG) + .set(Identifier::CODE_KEY, "1234"), {}, {}); auto validation = conv->validateParameters(); auto expected = std::list<std::string>{ diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp index a64959a8..a91d1906 100644 --- a/test/unit/test_operationfactory.cpp +++ b/test/unit/test_operationfactory.cpp @@ -211,8 +211,9 @@ TEST(operation, geogCRS_to_geogCRS_context_filter_bbox) { } { auto ctxt = CoordinateOperationContext::create( - authFactory, Extent::createFromBBOX(20.26 + .1, 43.44 + .1, - 31.41 - .1, 48.27 - .1), + authFactory, + Extent::createFromBBOX(20.26 + .1, 43.44 + .1, 31.41 - .1, + 48.27 - .1), 0.0); auto list = CoordinateOperationFactory::create()->createOperations( authFactory->createCoordinateReferenceSystem("4179"), @@ -222,8 +223,9 @@ TEST(operation, geogCRS_to_geogCRS_context_filter_bbox) { } { auto ctxt = CoordinateOperationContext::create( - authFactory, Extent::createFromBBOX(20.26 - .1, 43.44 - .1, - 31.41 + .1, 48.27 + .1), + authFactory, + Extent::createFromBBOX(20.26 - .1, 43.44 - .1, 31.41 + .1, + 48.27 + .1), 0.0); auto list = CoordinateOperationFactory::create()->createOperations( authFactory->createCoordinateReferenceSystem("4179"), @@ -2953,14 +2955,16 @@ TEST(operation, transformation_BEV_AT_to_PROJ_string) { TEST(operation, transformation_longitude_rotation_to_PROJ_string) { auto src = GeographicCRS::create( - PropertyMap(), GeodeticReferenceFrame::create( - PropertyMap(), Ellipsoid::WGS84, - optional<std::string>(), PrimeMeridian::GREENWICH), + PropertyMap(), + GeodeticReferenceFrame::create(PropertyMap(), Ellipsoid::WGS84, + optional<std::string>(), + PrimeMeridian::GREENWICH), EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE)); auto dest = GeographicCRS::create( - PropertyMap(), GeodeticReferenceFrame::create( - PropertyMap(), Ellipsoid::WGS84, - optional<std::string>(), PrimeMeridian::PARIS), + PropertyMap(), + GeodeticReferenceFrame::create(PropertyMap(), Ellipsoid::WGS84, + optional<std::string>(), + PrimeMeridian::PARIS), EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE)); auto transformation = Transformation::createLongitudeRotation( PropertyMap(), src, dest, Angle(10)); @@ -3090,9 +3094,10 @@ TEST(operation, compoundCRS_with_boundVerticalCRS_to_geogCRS) { TEST(operation, compoundCRS_with_boundGeogCRS_to_geogCRS) { auto geogCRS = GeographicCRS::create( - PropertyMap(), GeodeticReferenceFrame::create( - PropertyMap(), Ellipsoid::WGS84, - optional<std::string>(), PrimeMeridian::GREENWICH), + PropertyMap(), + GeodeticReferenceFrame::create(PropertyMap(), Ellipsoid::WGS84, + optional<std::string>(), + PrimeMeridian::GREENWICH), EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE)); auto horizBoundCRS = BoundCRS::createFromTOWGS84( geogCRS, std::vector<double>{1, 2, 3, 4, 5, 6, 7}); @@ -5391,8 +5396,8 @@ TEST(operation, compoundCRS_from_WKT2_no_id_to_geogCRS_3D_context) { op->exportToPROJString(PROJStringFormatter::create().get()); auto op2_proj = op2->exportToPROJString(PROJStringFormatter::create().get()); - EXPECT_EQ(op_proj, op2_proj) << "op=" << op->nameStr() - << " op2=" << op2->nameStr(); + EXPECT_EQ(op_proj, op2_proj) + << "op=" << op->nameStr() << " op2=" << op2->nameStr(); } } @@ -5469,7 +5474,7 @@ TEST(operation, compoundCRS_with_non_meter_horiz_and_vertical_to_geog) { " LENGTHUNIT[\"US survey foot\",0.304800609601219,\n" " ID[\"EPSG\",9003]]]]]" - ); + ); auto src = nn_dynamic_pointer_cast<CRS>(objSrc); ASSERT_TRUE(src != nullptr); auto authFactory = @@ -5627,8 +5632,9 @@ TEST(operation, isPROJInstantiable) { { auto transformation = Transformation::create( PropertyMap(), GeographicCRS::EPSG_4269, GeographicCRS::EPSG_4326, - nullptr, OperationMethod::create( - PropertyMap(), std::vector<OperationParameterNNPtr>{}), + nullptr, + OperationMethod::create(PropertyMap(), + std::vector<OperationParameterNNPtr>{}), std::vector<GeneralParameterValueNNPtr>{}, std::vector<PositionalAccuracyNNPtr>{}); EXPECT_FALSE(transformation->isPROJInstantiable( |
