From 5a053cea85f34087f3d732ec1a4c4d0232af58b9 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 12 Sep 2023 11:35:49 +0200 Subject: [PATCH 1/5] Moving test utility files outside cpp test folder --- .../test_included_parameters.json | 8 -------- .../more_levels_test_included_parameters.json | 0 .../test_bar_element.cpp | 2 +- .../test_bar_element.h | 0 .../test_constitutive_law.cpp | 2 +- .../test_constitutive_law.h | 0 .../test_element.cpp | 2 +- .../test_element.h | 0 kratos/tests/test_utilities/test_included_parameters.json | 8 ++++++++ .../test_included_parameters_level2.json | 0 .../test_laplacian_element.cpp | 2 +- .../test_laplacian_element.h | 0 12 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters.json rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/more_levels_test_included_parameters.json (100%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_bar_element.cpp (99%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_bar_element.h (100%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_constitutive_law.cpp (98%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_constitutive_law.h (100%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_element.cpp (99%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_element.h (100%) create mode 100644 kratos/tests/test_utilities/test_included_parameters.json rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_included_parameters_level2.json (100%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_laplacian_element.cpp (99%) rename kratos/tests/{cpp_tests/auxiliar_files_for_cpp_unnitest => test_utilities}/test_laplacian_element.h (100%) diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters.json b/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters.json deleted file mode 100644 index 9bdb942fc1c9..000000000000 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "level1": - { - "list_value":[ 3, "hi", false], - "tmp" : 5.0 - }, - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters_level2.json" -} \ No newline at end of file diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json b/kratos/tests/test_utilities/more_levels_test_included_parameters.json similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json rename to kratos/tests/test_utilities/more_levels_test_included_parameters.json diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.cpp b/kratos/tests/test_utilities/test_bar_element.cpp similarity index 99% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.cpp rename to kratos/tests/test_utilities/test_bar_element.cpp index bf0885c838b5..f63b0fb3ac26 100644 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.cpp +++ b/kratos/tests/test_utilities/test_bar_element.cpp @@ -19,7 +19,7 @@ #include "includes/define.h" #include "includes/expect.h" #include "includes/variables.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h" +#include "tests/test_utilities/test_bar_element.h" namespace Kratos::Testing { diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h b/kratos/tests/test_utilities/test_bar_element.h similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h rename to kratos/tests/test_utilities/test_bar_element.h diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.cpp b/kratos/tests/test_utilities/test_constitutive_law.cpp similarity index 98% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.cpp rename to kratos/tests/test_utilities/test_constitutive_law.cpp index d7ecb6c50003..80c8be857499 100644 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.cpp +++ b/kratos/tests/test_utilities/test_constitutive_law.cpp @@ -15,7 +15,7 @@ // External includes // Project includes -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h" +#include "tests/test_utilities/test_constitutive_law.h" #include "includes/expect.h" diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h b/kratos/tests/test_utilities/test_constitutive_law.h similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h rename to kratos/tests/test_utilities/test_constitutive_law.h diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.cpp b/kratos/tests/test_utilities/test_element.cpp similarity index 99% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.cpp rename to kratos/tests/test_utilities/test_element.cpp index ba4317193ec4..6107f52a74eb 100644 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.cpp +++ b/kratos/tests/test_utilities/test_element.cpp @@ -18,7 +18,7 @@ #include "includes/define.h" #include "includes/expect.h" #include "includes/variables.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h" +#include "tests/test_utilities/test_element.h" namespace Kratos::Testing { diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h b/kratos/tests/test_utilities/test_element.h similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h rename to kratos/tests/test_utilities/test_element.h diff --git a/kratos/tests/test_utilities/test_included_parameters.json b/kratos/tests/test_utilities/test_included_parameters.json new file mode 100644 index 000000000000..92737f9584b6 --- /dev/null +++ b/kratos/tests/test_utilities/test_included_parameters.json @@ -0,0 +1,8 @@ +{ + "level1": + { + "list_value":[ 3, "hi", false], + "tmp" : 5.0 + }, + "@include_json" : "testing_utilities/test_included_parameters_level2.json" +} \ No newline at end of file diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters_level2.json b/kratos/tests/test_utilities/test_included_parameters_level2.json similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters_level2.json rename to kratos/tests/test_utilities/test_included_parameters_level2.json diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.cpp b/kratos/tests/test_utilities/test_laplacian_element.cpp similarity index 99% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.cpp rename to kratos/tests/test_utilities/test_laplacian_element.cpp index 5747d7234e0f..786ab99b7261 100644 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.cpp +++ b/kratos/tests/test_utilities/test_laplacian_element.cpp @@ -20,7 +20,7 @@ #include "includes/variables.h" #include "utilities/math_utils.h" #include "utilities/geometry_utilities.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h" +#include "tests/test_utilities/test_laplacian_element.h" namespace Kratos::Testing { diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h b/kratos/tests/test_utilities/test_laplacian_element.h similarity index 100% rename from kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h rename to kratos/tests/test_utilities/test_laplacian_element.h From 05668a6ee3e292ab6f7e4d46e771f2022cf8a24c Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 12 Sep 2023 11:36:14 +0200 Subject: [PATCH 2/5] Moving mpi test utility files outside cpp test folder --- .../test_utilities}/mpi_cpp_test_utilities.cpp | 4 ++-- .../test_utilities}/mpi_cpp_test_utilities.h | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename kratos/mpi/{utilities => tests/test_utilities}/mpi_cpp_test_utilities.cpp (99%) rename kratos/mpi/{utilities => tests/test_utilities}/mpi_cpp_test_utilities.h (100%) diff --git a/kratos/mpi/utilities/mpi_cpp_test_utilities.cpp b/kratos/mpi/tests/test_utilities/mpi_cpp_test_utilities.cpp similarity index 99% rename from kratos/mpi/utilities/mpi_cpp_test_utilities.cpp rename to kratos/mpi/tests/test_utilities/mpi_cpp_test_utilities.cpp index 63e9c8324d5c..9bd73f697ba0 100644 --- a/kratos/mpi/utilities/mpi_cpp_test_utilities.cpp +++ b/kratos/mpi/tests/test_utilities/mpi_cpp_test_utilities.cpp @@ -18,10 +18,10 @@ #include "geometries/line_2d_2.h" #include "utilities/global_pointer_utilities.h" #include "mpi/includes/mpi_data_communicator.h" -#include "mpi/utilities/mpi_cpp_test_utilities.h" +#include "mpi/tests/test_utilities/mpi_cpp_test_utilities.h" #include "mpi/utilities/model_part_communicator_utilities.h" #include "mpi/utilities/parallel_fill_communicator.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h" +#include "tests/test_utilities/test_bar_element.h" namespace Kratos { diff --git a/kratos/mpi/utilities/mpi_cpp_test_utilities.h b/kratos/mpi/tests/test_utilities/mpi_cpp_test_utilities.h similarity index 100% rename from kratos/mpi/utilities/mpi_cpp_test_utilities.h rename to kratos/mpi/tests/test_utilities/mpi_cpp_test_utilities.h From 5b8da0ae82b78e5b3ff0bc0ea23ba1a5e139f137 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 12 Sep 2023 11:36:48 +0200 Subject: [PATCH 3/5] Referencing new locations --- .../cpp_tests/conditions/test_mesh_tying_condition.cpp | 2 +- .../tests/cpp_tests/test_builder_and_solver.cpp | 4 ++-- .../utilities/test_gather_modelpart_utility.cpp | 2 +- .../utilities/test_parallel_fill_communicator.cpp | 2 +- .../cpp_tests/includes/test_property_accessor.cpp | 4 ++-- .../processes/test_set_initial_state_process.cpp | 4 ++-- .../builder_and_solvers/test_builder_and_solver.cpp | 2 +- .../test_explicit_builder_and_solver.cpp | 2 +- .../strategies/explicit_strategy_testing_utils.h | 2 +- .../strategies/strategies/test_strategies.cpp | 4 ++-- kratos/tests/test_kratos_parameters.py | 10 +++++----- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/applications/ContactStructuralMechanicsApplication/tests/cpp_tests/conditions/test_mesh_tying_condition.cpp b/applications/ContactStructuralMechanicsApplication/tests/cpp_tests/conditions/test_mesh_tying_condition.cpp index e152153cb2e6..5363d0892cf2 100644 --- a/applications/ContactStructuralMechanicsApplication/tests/cpp_tests/conditions/test_mesh_tying_condition.cpp +++ b/applications/ContactStructuralMechanicsApplication/tests/cpp_tests/conditions/test_mesh_tying_condition.cpp @@ -19,7 +19,7 @@ #include "containers/model.h" #include "contact_structural_mechanics_application_variables.h" #include "custom_conditions/mesh_tying_mortar_condition.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h" +#include "tests/test_utilities/test_laplacian_element.h" // #include "input_output/vtk_output.h" /* Geometries */ diff --git a/applications/TrilinosApplication/tests/cpp_tests/test_builder_and_solver.cpp b/applications/TrilinosApplication/tests/cpp_tests/test_builder_and_solver.cpp index b6df40601d23..56c3e8ed205f 100644 --- a/applications/TrilinosApplication/tests/cpp_tests/test_builder_and_solver.cpp +++ b/applications/TrilinosApplication/tests/cpp_tests/test_builder_and_solver.cpp @@ -27,11 +27,11 @@ #include "mpi/includes/mpi_data_communicator.h" #include "mpi/utilities/parallel_fill_communicator.h" #include "mpi/utilities/model_part_communicator_utilities.h" -#include "mpi/utilities/mpi_cpp_test_utilities.h" +#include "mpi/tests/test_utilities/mpi_cpp_test_utilities.h" /* Element include */ #include "geometries/line_2d_2.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h" +#include "tests/test_utilities/test_bar_element.h" /* Linear solvers */ #include "linear_solvers/linear_solver.h" diff --git a/kratos/mpi/tests/cpp_tests/utilities/test_gather_modelpart_utility.cpp b/kratos/mpi/tests/cpp_tests/utilities/test_gather_modelpart_utility.cpp index f0c56b5b959e..9669ae27ab9c 100644 --- a/kratos/mpi/tests/cpp_tests/utilities/test_gather_modelpart_utility.cpp +++ b/kratos/mpi/tests/cpp_tests/utilities/test_gather_modelpart_utility.cpp @@ -17,7 +17,7 @@ // Project includes #include "testing/testing.h" #include "containers/model.h" -#include "mpi/utilities/mpi_cpp_test_utilities.h" +#include "mpi/tests/test_utilities/mpi_cpp_test_utilities.h" #include "mpi/utilities/parallel_fill_communicator.h" #include "mpi/utilities/gather_modelpart_utility.h" diff --git a/kratos/mpi/tests/cpp_tests/utilities/test_parallel_fill_communicator.cpp b/kratos/mpi/tests/cpp_tests/utilities/test_parallel_fill_communicator.cpp index f9326b6a9b5c..969708308288 100644 --- a/kratos/mpi/tests/cpp_tests/utilities/test_parallel_fill_communicator.cpp +++ b/kratos/mpi/tests/cpp_tests/utilities/test_parallel_fill_communicator.cpp @@ -17,7 +17,7 @@ // Project includes #include "testing/testing.h" #include "containers/model.h" -#include "mpi/utilities/mpi_cpp_test_utilities.h" +#include "mpi/tests/test_utilities/mpi_cpp_test_utilities.h" #include "mpi/utilities/parallel_fill_communicator.h" namespace Kratos::Testing diff --git a/kratos/tests/cpp_tests/includes/test_property_accessor.cpp b/kratos/tests/cpp_tests/includes/test_property_accessor.cpp index 9e51528d777a..1a4ccd3495e1 100644 --- a/kratos/tests/cpp_tests/includes/test_property_accessor.cpp +++ b/kratos/tests/cpp_tests/includes/test_property_accessor.cpp @@ -20,8 +20,8 @@ #include "includes/properties.h" #include "includes/table_accessor.h" #include "geometries/quadrilateral_2d_4.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h" +#include "tests/test_utilities/test_element.h" +#include "tests/test_utilities/test_constitutive_law.h" #include "includes/serializer.h" namespace Kratos::Testing diff --git a/kratos/tests/cpp_tests/processes/test_set_initial_state_process.cpp b/kratos/tests/cpp_tests/processes/test_set_initial_state_process.cpp index 983ad5915158..6c93fafbdaa2 100644 --- a/kratos/tests/cpp_tests/processes/test_set_initial_state_process.cpp +++ b/kratos/tests/cpp_tests/processes/test_set_initial_state_process.cpp @@ -17,8 +17,8 @@ // Project includes #include "containers/model.h" #include "testing/testing.h" -#include"tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h" -#include"tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h" +#include"tests/test_utilities/test_constitutive_law.h" +#include"tests/test_utilities/test_element.h" #include "geometries/quadrilateral_2d_4.h" #include "geometries/tetrahedra_3d_4.h" diff --git a/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_builder_and_solver.cpp b/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_builder_and_solver.cpp index 52297f117f0d..63131d73cc86 100644 --- a/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_builder_and_solver.cpp +++ b/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_builder_and_solver.cpp @@ -26,7 +26,7 @@ /* Element include */ #include "geometries/line_2d_2.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h" +#include "tests/test_utilities/test_bar_element.h" /* Linear solvers */ #include "linear_solvers/reorderer.h" diff --git a/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_explicit_builder_and_solver.cpp b/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_explicit_builder_and_solver.cpp index b87916c447d3..c41638438d42 100644 --- a/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_explicit_builder_and_solver.cpp +++ b/kratos/tests/cpp_tests/strategies/builder_and_solvers/test_explicit_builder_and_solver.cpp @@ -23,7 +23,7 @@ #include "includes/model_part.h" #include "spaces/ublas_space.h" #include "geometries/line_2d_2.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_bar_element.h" +#include "tests/test_utilities/test_bar_element.h" #include "solving_strategies/builder_and_solvers/explicit_builder.h" namespace Kratos diff --git a/kratos/tests/cpp_tests/strategies/strategies/explicit_strategy_testing_utils.h b/kratos/tests/cpp_tests/strategies/strategies/explicit_strategy_testing_utils.h index 410560c43770..119d07ef63b3 100644 --- a/kratos/tests/cpp_tests/strategies/strategies/explicit_strategy_testing_utils.h +++ b/kratos/tests/cpp_tests/strategies/strategies/explicit_strategy_testing_utils.h @@ -26,7 +26,7 @@ #include "includes/define.h" #include "includes/model_part.h" #include "spaces/ublas_space.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h" +#include "tests/test_utilities/test_element.h" #include "solving_strategies/builder_and_solvers/residualbased_block_builder_and_solver.h" #include "solving_strategies/strategies/explicit_solving_strategy.h" #include "utilities/math_utils.h" diff --git a/kratos/tests/cpp_tests/strategies/strategies/test_strategies.cpp b/kratos/tests/cpp_tests/strategies/strategies/test_strategies.cpp index fa8b18e50fce..1ef892bc86ad 100755 --- a/kratos/tests/cpp_tests/strategies/strategies/test_strategies.cpp +++ b/kratos/tests/cpp_tests/strategies/strategies/test_strategies.cpp @@ -26,8 +26,8 @@ #include "spaces/ublas_space.h" /* Element include */ -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_element.h" -#include "tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_constitutive_law.h" +#include "tests/test_utilities/test_element.h" +#include "tests/test_utilities/test_constitutive_law.h" // Linear solvers #include "linear_solvers/reorderer.h" diff --git a/kratos/tests/test_kratos_parameters.py b/kratos/tests/test_kratos_parameters.py index 56915a5e8ee7..bb19709106bf 100644 --- a/kratos/tests/test_kratos_parameters.py +++ b/kratos/tests/test_kratos_parameters.py @@ -234,7 +234,7 @@ json_with_includes = """ { "bool_value" : true, "double_value": 2.0, "int_value" : 10, - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/test_included_parameters.json" + "@include_json" : "testing_utilities/test_included_parameters.json" } """ @@ -243,7 +243,7 @@ "bool_value" : true, "double_value": 2.0, "int_value" : 10, "level1": { - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json" + "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" }, "string_value" : "hello" } @@ -254,10 +254,10 @@ "bool_value" : true, "double_value": 2.0, "int_value" : 10, "level1": [ { - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json", + "@include_json" : "testing_utilities/more_levels_test_included_parameters.json", "vector": [ { - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json" + "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" } ] }, @@ -265,7 +265,7 @@ "hello": 0 }, { - "@include_json" : "cpp_tests/auxiliar_files_for_cpp_unnitest/more_levels_test_included_parameters.json" + "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" } ], "string_value" : "hello" From abee0e084b2b1870b30eb366d1c7bedc4284ebc4 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 12 Sep 2023 11:37:14 +0200 Subject: [PATCH 4/5] Adding back moved sources as part of the testing sources --- kratos/CMakeLists.txt | 5 ++++- kratos/mpi/CMakeLists.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kratos/CMakeLists.txt b/kratos/CMakeLists.txt index 419fc96e45df..daa2a8561971 100644 --- a/kratos/CMakeLists.txt +++ b/kratos/CMakeLists.txt @@ -62,7 +62,10 @@ file(GLOB KRATOS_EXPRESSION_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/expression/*.cpp ## Kratos tests sources. Enabled by default if(${KRATOS_BUILD_TESTING} MATCHES ON) - file(GLOB_RECURSE KRATOS_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp) + file(GLOB_RECURSE KRATOS_TEST_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_utilities/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp + ) endif(${KRATOS_BUILD_TESTING} MATCHES ON) ## Define KratosVersion object diff --git a/kratos/mpi/CMakeLists.txt b/kratos/mpi/CMakeLists.txt index a20117bb553c..00b93642c22f 100644 --- a/kratos/mpi/CMakeLists.txt +++ b/kratos/mpi/CMakeLists.txt @@ -17,7 +17,10 @@ file(GLOB_RECURSE KRATOS_MPI_PYTHON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/python/* ## Kratos MPI test sources. if(${KRATOS_BUILD_TESTING} MATCHES ON) - file(GLOB_RECURSE KRATOS_MPI_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp) + file(GLOB_RECURSE KRATOS_MPI_TEST_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_utilities/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp + ) endif(${KRATOS_BUILD_TESTING} MATCHES ON) ############################################################################### From d2ea0f9fab1af2638bc0bc6376126233ebce6dd3 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 12 Sep 2023 12:31:55 +0200 Subject: [PATCH 5/5] Typo --- kratos/tests/test_kratos_parameters.py | 10 +++++----- .../tests/test_utilities/test_included_parameters.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kratos/tests/test_kratos_parameters.py b/kratos/tests/test_kratos_parameters.py index bb19709106bf..376d3e7e7d1f 100644 --- a/kratos/tests/test_kratos_parameters.py +++ b/kratos/tests/test_kratos_parameters.py @@ -234,7 +234,7 @@ json_with_includes = """ { "bool_value" : true, "double_value": 2.0, "int_value" : 10, - "@include_json" : "testing_utilities/test_included_parameters.json" + "@include_json" : "test_utilities/test_included_parameters.json" } """ @@ -243,7 +243,7 @@ "bool_value" : true, "double_value": 2.0, "int_value" : 10, "level1": { - "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" + "@include_json" : "test_utilities/more_levels_test_included_parameters.json" }, "string_value" : "hello" } @@ -254,10 +254,10 @@ "bool_value" : true, "double_value": 2.0, "int_value" : 10, "level1": [ { - "@include_json" : "testing_utilities/more_levels_test_included_parameters.json", + "@include_json" : "test_utilities/more_levels_test_included_parameters.json", "vector": [ { - "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" + "@include_json" : "test_utilities/more_levels_test_included_parameters.json" } ] }, @@ -265,7 +265,7 @@ "hello": 0 }, { - "@include_json" : "testing_utilities/more_levels_test_included_parameters.json" + "@include_json" : "test_utilities/more_levels_test_included_parameters.json" } ], "string_value" : "hello" diff --git a/kratos/tests/test_utilities/test_included_parameters.json b/kratos/tests/test_utilities/test_included_parameters.json index 92737f9584b6..60660e9a96ba 100644 --- a/kratos/tests/test_utilities/test_included_parameters.json +++ b/kratos/tests/test_utilities/test_included_parameters.json @@ -4,5 +4,5 @@ "list_value":[ 3, "hi", false], "tmp" : 5.0 }, - "@include_json" : "testing_utilities/test_included_parameters_level2.json" + "@include_json" : "test_utilities/test_included_parameters_level2.json" } \ No newline at end of file