From ecf9cf0d975b3eb7630a314e8b32dd59658c3e2a Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 8 Oct 2020 17:31:13 +0200 Subject: getCRSInfoList(): make it use area description --- test/unit/test_c_api.cpp | 2 +- test/unit/test_factory.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index c20aec39..8e1dddfa 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -3397,7 +3397,7 @@ TEST_F(CApi, proj_get_crs_info_list_from_database) { EXPECT_EQ(list[i]->south_lat_degree, -90.0); EXPECT_EQ(list[i]->east_lon_degree, 180.0); EXPECT_EQ(list[i]->north_lat_degree, 90.0); - EXPECT_EQ(std::string(list[i]->area_name), "World"); + EXPECT_EQ(std::string(list[i]->area_name), "World."); EXPECT_EQ(list[i]->projection_method_name, nullptr); } else if (code == "4978") { found4978 = true; diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp index 5ddc2387..37f546f1 100644 --- a/test/unit/test_factory.cpp +++ b/test/unit/test_factory.cpp @@ -3151,7 +3151,7 @@ TEST(factory, getCRSInfoList) { EXPECT_EQ(info.south_lat_degree, -90.0); EXPECT_EQ(info.east_lon_degree, 180.0); EXPECT_EQ(info.north_lat_degree, 90.0); - EXPECT_EQ(info.areaName, "World"); + EXPECT_EQ(info.areaName, "World."); EXPECT_TRUE(info.projectionMethodName.empty()); found4326 = true; } else if (info.code == "4296") { // Soudan - deprecated @@ -3180,9 +3180,10 @@ TEST(factory, getCRSInfoList) { EXPECT_EQ(info.south_lat_degree, 0.0); EXPECT_EQ(info.east_lon_degree, 6.0); EXPECT_EQ(info.north_lat_degree, 84.0); - EXPECT_EQ(info.areaName, "World - N hemisphere - 0\xC2\xB0" - "E to 6\xC2\xB0" - "E - by country"); + EXPECT_TRUE(info.areaName.find("Between 0\xC2\xB0" + "E and 6\xC2\xB0" + "E, northern hemisphere") == 0) + << info.areaName; EXPECT_EQ(info.projectionMethodName, "Transverse Mercator"); found32631 = true; } else if (info.code == "3855") { -- cgit v1.2.3