Start migration test to cmake tests

Author: sea5kg

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [v0.1.8] - 2022-01-12 (2022 Jan 12)
 
 - Fixed #35 Add valFloat / valDouble
+- Start migrating tests to cmake tests
+- Updated copyright
+- Fix for c++ builder 12.2
+- Make compatible code with compiler bcc32 C++ Builder
+
 
 ## [v0.1.7] - 2022-01-12 (2022 Jan 12)
 

CMakeLists.txt

@@ -1,3 +1,27 @@
+# MIT License
+#
+# Copyright (c) 2019-2025 wsjcpp
+#
+# 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.
+#
+# Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
+
 cmake_minimum_required(VERSION 3.0)
 
 project(wsjcpp-yaml)
@@ -34,3 +58,7 @@ install(
     RUNTIME DESTINATION
         /usr/bin
 )
+
+# enable testing functionality
+enable_testing()
+add_subdirectory(src/tests)

build_simple.sh

@@ -24,3 +24,6 @@ check_ret $? "configure"
 
 cmake --build ./tmp/linux_release --config Release
 check_ret $? "build"
+
+cd ./tmp/linux_release && ctest --output-on-failure
+check_ret $? "tests"

src/tests/CMakeLists.txt

@@ -0,0 +1,47 @@
+# MIT License
+#
+# Copyright (c) 2019-2025 wsjcpp
+#
+# 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.
+#
+# Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
+
+file(GLOB ALL_TESTS
+     "test_*.cpp"
+)
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY tests)
+
+list (APPEND TEST_YAML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../wsjcpp_yaml.cpp")
+
+foreach(_TEST ${ALL_TESTS})
+    get_filename_component(TESTNAME ${_TEST} NAME_WE)
+    add_executable(${TESTNAME}
+        ${_TEST}
+        ${TEST_YAML_SOURCES}
+    )
+    target_link_libraries(${TESTNAME} -lpthread ${WSJCPP_LIBRARIES})
+
+    add_test(
+      NAME ${TESTNAME}
+      COMMAND $<TARGET_FILE:${TESTNAME}>
+    )
+    message(${CMAKE_CURRENT_BINARY_DIR}/tests)
+    set_target_properties (${TESTNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY tests)
+endforeach()

src/tests/data-tests/float-double/example.yml

@@ -0,0 +1,2 @@
+float: 1.0001
+double: 1.0002

src/tests/test_double_value.cpp

@@ -0,0 +1,78 @@
+#include <vector>
+#include <iostream>
+#include <cmath>
+#include <wsjcpp_yaml.h>
+
+#ifdef WINDOWS
+#include <direct.h>
+#define GetCurrentDir _getcwd
+#else
+#include <unistd.h>
+#define GetCurrentDir getcwd
+#endif
+
+int main() {
+    char buff[FILENAME_MAX];
+    GetCurrentDir(buff, FILENAME_MAX );
+    std::cout << "Current path: " << buff << std::endl;
+
+    WsjcppYaml yaml;
+    std::string sFilepath = "../../../../src/tests/data-tests/float-double/example.yml";
+    std::string sError;
+    if (!yaml.loadFromFile(sFilepath, sError)) {
+        std::cerr << "Error parsing: " << sError << std::endl;
+        return -1;
+    }
+
+    int ret = 0;
+    if (!yaml.getRoot()->hasElement("double")) {
+        std::cerr << "Parameter 'float' not found" << std::endl;
+        ret = -1;
+    }
+
+    if (!yaml.getRoot()->hasElement("double")) {
+        std::cerr << "Parameter 'double' has not value" << std::endl;
+        ret = -1;
+    }
+
+    std::string expected_val_str = "1.0002";
+    if (yaml.getRoot()->getElement("double")->getValue() != expected_val_str) {
+        std::cerr << "Parameter 'double' has value string '" << yaml.getRoot()->getElement("double")->getValue() << "', but expected '" << expected_val_str << "'" << std::endl;
+        ret = -1;
+    }
+
+    double val_double = yaml["double"].valDouble();
+    double expected_double = 1.0002f;
+    // std::numeric_limits<double>::epsilon() => 2.22045e-16
+    // std::numeric_limits<float>::epsilon() => 1.19209e-07
+    // abs(val_double - expected_double) => 3.31879e-08
+    if (abs(val_double - expected_double) > std::numeric_limits<float>::epsilon()) {
+        std::cerr << "Parameter 'double' has value number '" << val_double << "', but expected '" << expected_double << "'" << std::endl;
+        ret = -1;
+    }
+
+    yaml["double"].val(1.0003f);
+
+    expected_val_str = "1.0003";
+    if (yaml.getRoot()->getElement("double")->getValue() != expected_val_str) {
+        std::cerr << "Parameter 'double' has value string '" << yaml.getRoot()->getElement("double")->getValue() << "', but expected '" << expected_val_str << "'" << std::endl;
+        ret = -1;
+    }
+
+    expected_double = 1.0003f;
+    val_double = yaml["double"].valDouble();
+    if (abs(val_double - expected_double) > std::numeric_limits<float>::epsilon()) {
+        std::cerr << "Parameter 'double' has value number '" << val_double << "', but expected '" << expected_double << "'" << std::endl;
+        ret = -1;
+    }
+    float val_double_like_float = yaml["double"].valFloat();
+    float expected_float = 1.0003f;
+    if (abs(val_double_like_float - expected_float) > std::numeric_limits<float>::epsilon()) {
+        std::cerr << "Parameter 'double' has value number (like float) '" << val_double_like_float << "', but expected '" << expected_float << "'" << std::endl;
+        ret = -1;
+    }
+
+    // compareD("has double value is 1.0003 (double 2)", yaml["double"].valDouble(), 1.0003f);
+
+    return ret;
+}

src/tests/test_float_value.cpp

@@ -0,0 +1,52 @@
+#include <vector>
+#include <iostream>
+#include <cmath>
+#include <wsjcpp_yaml.h>
+
+#ifdef WINDOWS
+#include <direct.h>
+#define GetCurrentDir _getcwd
+#else
+#include <unistd.h>
+#define GetCurrentDir getcwd
+#endif
+
+int main() {
+    char buff[FILENAME_MAX];
+    GetCurrentDir(buff, FILENAME_MAX);
+    std::cout << "Current path: " << buff << std::endl;
+
+    WsjcppYaml yaml;
+    std::string sFilepath = "../../../../src/tests/data-tests/float-double/example.yml";
+    std::string sError;
+    if (!yaml.loadFromFile(sFilepath, sError)) {
+        std::cerr << "Error parsing: " << sError << std::endl;
+        return -1;
+    }
+
+    int ret = 0;
+    if (!yaml.getRoot()->hasElement("float")) {
+        std::cerr << "Parameter 'float' not found" << std::endl;
+        ret = -1;
+    }
+
+    if (!yaml.getRoot()->hasElement("float")) {
+        std::cerr << "Parameter 'float' has not value" << std::endl;
+        ret = -1;
+    }
+
+    std::string expected_val_str = "1.0001";
+    if (yaml.getRoot()->getElement("float")->getValue() != expected_val_str) {
+        std::cerr << "Parameter 'float' has value '" << yaml.getRoot()->getElement("float")->getValue() << "', but expected '" << expected_val_str << "'" << std::endl;
+        ret = -1;
+    }
+
+    float val_float = yaml["float"].valFloat();
+    float expected_float = 1.0001f;
+    if (abs(val_float - expected_float) > std::numeric_limits<float>::epsilon()) {
+        std::cerr << "Parameter 'float' has value '" << val_float << "', but expected '" << expected_float << "'" << std::endl;
+        ret = -1;
+    }
+
+    return ret;
+}

unit-tests.wsjcpp/CMakeLists.txt

@@ -52,7 +52,6 @@ list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_t
 list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_cleanup.cpp")
 list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_append_elements.cpp")
 list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_keep_format.cpp")
-list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_float_double.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)