From d742d57a6b8c3c48bca96a215a8304dbe1ceccf8 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 20 Jun 2018 11:47:31 +0200 Subject: [PATCH 1/2] Add proj_errno_string() to proj.def --- src/proj.def | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/proj.def b/src/proj.def index 9b0a95d8f5..3dd7cf0ee3 100644 --- a/src/proj.def +++ b/src/proj.def @@ -157,3 +157,5 @@ EXPORTS proj_context_errno @141 pj_isnan @142 + + proj_errno_string @143 From b87b59106879188ffc684a41a9de638ac5fd02bf Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Wed, 20 Jun 2018 15:11:50 +0200 Subject: [PATCH 2/2] Add test for proj_errno_string() --- test/unit/CMakeLists.txt | 9 ++++ test/unit/Makefile.am | 9 +++- test/unit/proj_errno_string_test.cpp | 68 ++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 test/unit/proj_errno_string_test.cpp diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index a22665f851..d6f6b068bb 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -58,6 +58,15 @@ target_link_libraries(proj_test_unit ${PROJ_LIBRARIES}) add_test(NAME proj_test_unit COMMAND proj_test_unit) +add_executable(proj_errno_string_test + main.cpp + proj_errno_string_test.cpp) +target_link_libraries(proj_errno_string_test + gtest + ${PROJ_LIBRARIES}) +add_test(NAME proj_errno_string_test COMMAND proj_errno_string_test) + + if (MSVC AND BUILD_LIBPROJ_SHARED) # ph_phi2_test not compatible of a .dll build else() diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 8c8b60d860..b625c592c7 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -9,6 +9,7 @@ AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@ bin_PROGRAMS = basic_test bin_PROGRAMS += pj_phi2_test +bin_PROGRAMS += proj_errno_string_test basic_test_SOURCES = basic_test.cpp main.cpp basic_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la @@ -22,5 +23,11 @@ pj_phi2_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la pj_phi2_test-check: pj_phi2_test ./pj_phi2_test +proj_errno_string_test_SOURCES = proj_errno_string_test.cpp main.cpp +proj_errno_string_test_LDADD= ../../src/libproj.la ../../test/googletest/libgtest.la + +proj_errno_string_test-check: proj_errno_string_test + ./proj_errno_string_test + check-local: basic_test-check -check-local: pj_phi2_test-check +check-local: pj_phi2_test-check proj_errno_string_test-check diff --git a/test/unit/proj_errno_string_test.cpp b/test/unit/proj_errno_string_test.cpp new file mode 100644 index 0000000000..0e4cff7f34 --- /dev/null +++ b/test/unit/proj_errno_string_test.cpp @@ -0,0 +1,68 @@ +/****************************************************************************** + * + * Project: PROJ + * Purpose: Unit test for proj_errno_string() + * Author: Kristian Evers + * + ****************************************************************************** + * Copyright (c) 2018, Kristian Evers. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ****************************************************************************/ + +#include + +#include "proj.h" + +#include "gtest_include.h" + +namespace { + +TEST(ProjErrnoStringTest, NoError) { + EXPECT_EQ(0, proj_errno_string(0)); +} + +TEST(ProjErrnoStringTest, ProjErrnos) { + EXPECT_STREQ("no arguments in initialization list", proj_errno_string(-1)); + EXPECT_STREQ("invalid projection system error (-1000)", proj_errno_string(-1000)); + EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-9999)); + // for errnos < -9999, -9999 is always returned + constexpr int min = std::numeric_limits::min(); + EXPECT_STREQ("invalid projection system error (-9999)",proj_errno_string(min)); + EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-10000)); +} + +TEST(ProjErrnoStringTest, SystemErrnos) { + constexpr int max = std::numeric_limits::max(); + +#ifdef HAVE_STRERROR + EXPECT_STREQ(strerror(5), proj_errno_string(5)); + EXPECT_STREQ(strerror(9999), proj_errno_string(9999)); + EXPECT_STREQ(strerror(10000), proj_errno_string(10000)); + EXPECT_STREQ(strerror(max), proj_errno_string(max)); +#else + EXPECT_STREQ("no system list, errno: 5\n", proj_errno_string(5)); + EXPECT_STREQ("no system list, errno: 9999\n", proj_errno_string(9999)); + // for errnos > 9999, 9999 is always returned + EXPECT_STREQ("no system list, errno: 9999\n", proj_errno_string(10000)); + EXPECT_STREQ("no system list, errno: 9999\n", proj_errno_string(max)); +#endif +} + +} // namespace