From 7aa71fb202490191675b52bc3607f2fd499782e8 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 2 Aug 2024 18:52:00 -0500 Subject: [PATCH] updated build system --- .../repertory_test/src/string_utils_test.cpp | 48 ---------------- repertory/repertory_test/src/version_test.cpp | 57 ------------------- .../3rd_party/test/src/utils/string_test.cpp | 22 +++++++ 3 files changed, 22 insertions(+), 105 deletions(-) delete mode 100644 repertory/repertory_test/src/string_utils_test.cpp delete mode 100644 repertory/repertory_test/src/version_test.cpp diff --git a/repertory/repertory_test/src/string_utils_test.cpp b/repertory/repertory_test/src/string_utils_test.cpp deleted file mode 100644 index 77fb3480..00000000 --- a/repertory/repertory_test/src/string_utils_test.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright <2018-2024> - - 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 "test_common.hpp" - -#include "utils/string.hpp" - -namespace repertory { -TEST(string_utils, is_numeric) { - EXPECT_TRUE(utils::string::is_numeric("100")); - EXPECT_TRUE(utils::string::is_numeric("+100")); - EXPECT_TRUE(utils::string::is_numeric("-100")); - - EXPECT_TRUE(utils::string::is_numeric("100.00")); - EXPECT_TRUE(utils::string::is_numeric("+100.00")); - EXPECT_TRUE(utils::string::is_numeric("-100.00")); - - EXPECT_FALSE(utils::string::is_numeric("1.00.00")); - EXPECT_FALSE(utils::string::is_numeric("+1.00.00")); - EXPECT_FALSE(utils::string::is_numeric("-1.00.00")); - - EXPECT_FALSE(utils::string::is_numeric("a1")); - EXPECT_FALSE(utils::string::is_numeric("1a")); - - EXPECT_FALSE(utils::string::is_numeric("+")); - EXPECT_FALSE(utils::string::is_numeric("-")); - - EXPECT_FALSE(utils::string::is_numeric("")); -} -} // namespace repertory diff --git a/repertory/repertory_test/src/version_test.cpp b/repertory/repertory_test/src/version_test.cpp deleted file mode 100644 index 04a24e3a..00000000 --- a/repertory/repertory_test/src/version_test.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - Copyright <2018-2024> - - 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 "test_common.hpp" - -#include "utils/common.hpp" - -namespace repertory { -TEST(version, equal) { - EXPECT_EQ(0, utils::compare_version_strings("1.0", "1.0")); - EXPECT_EQ(0, utils::compare_version_strings("1.0.0", "1.0")); - EXPECT_EQ(0, utils::compare_version_strings("1.0.0.0", "1.0")); - EXPECT_EQ(0, utils::compare_version_strings("1.0.0.0", "1.0.0")); -} - -TEST(version, greater) { - EXPECT_EQ(1, utils::compare_version_strings("1.0.1", "1.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1", "1.0.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1", "1.0.0.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1.0", "1.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1.0", "1.0.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1.0", "1.0.0.0")); - EXPECT_EQ(1, utils::compare_version_strings("1.0", "0.9.9")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1", "0.9.9")); - EXPECT_EQ(1, utils::compare_version_strings("1.0.1.0", "0.9.9")); -} - -TEST(version, less) { - EXPECT_EQ(-1, utils::compare_version_strings("0.9.9", "1.0")); - EXPECT_EQ(-1, utils::compare_version_strings("0.9.9", "1.0.1")); - EXPECT_EQ(-1, utils::compare_version_strings("0.9.9", "1.0.1.0")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0", "1.0.1")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0", "1.0.1.0")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0.0", "1.0.1")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0.0", "1.0.1.0")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0.0.0", "1.0.1")); - EXPECT_EQ(-1, utils::compare_version_strings("1.0.0.0", "1.0.1.0")); -} -} // namespace repertory diff --git a/support/3rd_party/test/src/utils/string_test.cpp b/support/3rd_party/test/src/utils/string_test.cpp index 1fa4c67e..87f284f5 100644 --- a/support/3rd_party/test/src/utils/string_test.cpp +++ b/support/3rd_party/test/src/utils/string_test.cpp @@ -93,4 +93,26 @@ TEST(utils_string, replace_string) { utils::string::replace(str_w, L"o", L"0"); EXPECT_STREQ(L"m00se", str_w.c_str()); } + +TEST(utils_string, is_numeric) { + EXPECT_TRUE(utils::string::is_numeric("100")); + EXPECT_TRUE(utils::string::is_numeric("+100")); + EXPECT_TRUE(utils::string::is_numeric("-100")); + + EXPECT_TRUE(utils::string::is_numeric("100.00")); + EXPECT_TRUE(utils::string::is_numeric("+100.00")); + EXPECT_TRUE(utils::string::is_numeric("-100.00")); + + EXPECT_FALSE(utils::string::is_numeric("1.00.00")); + EXPECT_FALSE(utils::string::is_numeric("+1.00.00")); + EXPECT_FALSE(utils::string::is_numeric("-1.00.00")); + + EXPECT_FALSE(utils::string::is_numeric("a1")); + EXPECT_FALSE(utils::string::is_numeric("1a")); + + EXPECT_FALSE(utils::string::is_numeric("+")); + EXPECT_FALSE(utils::string::is_numeric("-")); + + EXPECT_FALSE(utils::string::is_numeric("")); +} } // namespace repertory