Merge branch 'main' into feature/auto-tap-changer-skeleton

Author: Jerry-Jinfeng-Guo

build.sh

@@ -68,6 +68,8 @@ if [[ "${COVERAGE}" ]];  then
 
   PATH=${PATH}:${PWD} lcov -q -c \
     -d ${BUILD_DIR}/tests/cpp_unit_tests/CMakeFiles/power_grid_model_unit_tests.dir \
+    -d ${BUILD_DIR}/tests/cpp_integration_tests/CMakeFiles/power_grid_model_integration_tests.dir \
+    -d ${BUILD_DIR}/tests/cpp_validation_tests/CMakeFiles/power_grid_model_validation_tests.dir \
     -d ${BUILD_DIR}/tests/c_api_tests/CMakeFiles/power_grid_model_c_api_tests.dir \
     -d ${BUILD_DIR}/power_grid_model_c/power_grid_model_c/CMakeFiles/power_grid_model_c.dir \
     -b . \
@@ -82,7 +84,7 @@ fi
 if [[ ${INSTALL} ]]; then
   cmake --build --preset ${PRESET} --target install
 
-  # integration test
+  # end-to-end test
   if [[ ${INTEGRATION_TEST} ]]; then
     cd tests/package_tests
     cmake --preset ${PRESET}

docs/advanced_documentation/build-guide.md

@@ -118,8 +118,9 @@ library `power_grid_model`. There are four sub-projects defined in the root cmak
 
 * `power_grid_model_c`: a dynamic library (`.dll` or `.so`) with stable pure C API/ABI which can be used by any application
 * `tests/cpp_unit_tests`: the unit test target for the C++ core using the `doctest` framework.
-* `tests/c_api_tests`: the C API test target using the `doctest` framework
+* `tests/cpp_integration_tests`: the integration test target for the C++ core using the `doctest` framework.
 * `tests/cpp_validation_tests`: the validation test target using the `doctest` framework
+* `tests/c_api_tests`: the C API test target using the `doctest` framework
 * `tests/benchmark_cpp`: the C++ benchmark target for performance measure.
 * `power_grid_model_c_example`: an example C program to call the dynamic library
 

docs/contribution/folder-structure.md

@@ -15,6 +15,8 @@ The repository folder structure is as follows. The `docs` and `scripts` folders
 - The code for validation of input data is in {{ "[validation]({}/src/power_grid_model/validation)".format(gh_link_head_tree) }} folder.
 - The {{ "[tests]({}/tests)".format(gh_link_head_tree) }} folder is divided in the following way:
   - `cpp_unit_tests` contains the tests for the C++ calculation core.
+  - `cpp_integration_tests` contains more extensive tests for the C++ calculation core.
+  - `cpp_validation_tests` contains the validation test cases for the C++ calculation core.
   - `c_api_tests` contains the tests for communication with the C API.
   - `benchmark_cpp` contains a benchmark test case generator in C++.
   - `package_tests` contains an integration test CMake project that tests whether the C API package is correctly installed.

sonar-project.properties

@@ -11,7 +11,7 @@ sonar.projectVersion=1.0
 
 # include C++ and Python source file
 # since the C++ part is header only, also include the C++ unit test .cpp file
-sonar.sources=src,tests/cpp_unit_tests,tests/c_api_tests,power_grid_model_c
+sonar.sources=src,tests/cpp_unit_tests,tests/cpp_integration_tests,tests/cpp_validation_tests,tests/c_api_tests,power_grid_model_c
 sonar.tests=tests/unit
 sonar.sourceEncoding=UTF-8
 

tests/CMakeLists.txt

@@ -8,5 +8,6 @@ include("${doctest_DIR}/doctest.cmake")
 
 add_subdirectory("c_api_tests")
 add_subdirectory("cpp_unit_tests")
+add_subdirectory("cpp_integration_tests")
 add_subdirectory("cpp_validation_tests")
 add_subdirectory("benchmark_cpp")

tests/cpp_integration_tests/CMakeLists.txt

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <[email protected]>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+set(PROJECT_SOURCES
+    "test_entry_point.cpp"
+    "test_main_model_sc.cpp"
+    "test_main_model_se.cpp"
+    "test_main_model.cpp"
+    "test_main_model_static.cpp"
+    "test_math_solver.cpp"
+)
+
+add_executable(power_grid_model_integration_tests ${PROJECT_SOURCES})
+
+target_link_libraries(power_grid_model_integration_tests
+    PRIVATE
+        power_grid_model
+        doctest::doctest
+        nlohmann_json nlohmann_json::nlohmann_json
+)
+
+doctest_discover_tests(power_grid_model_integration_tests)

tests/cpp_integration_tests/test_entry_point.cpp

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <[email protected]>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+// main cpp file
+
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
+#include <doctest/doctest.h>