From efa929c1ee88e80c25cdc38eaeaffb227436eaed Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Wed, 27 Nov 2024 13:03:31 +0800 Subject: [PATCH 1/2] Fix catch2 header Signed-off-by: Luca Della Vedova --- nexus_workcell_orchestrator/src/job_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nexus_workcell_orchestrator/src/job_manager_test.cpp b/nexus_workcell_orchestrator/src/job_manager_test.cpp index 121dc48..5584b21 100644 --- a/nexus_workcell_orchestrator/src/job_manager_test.cpp +++ b/nexus_workcell_orchestrator/src/job_manager_test.cpp @@ -19,7 +19,7 @@ #include -#include +#include namespace nexus::workcell_orchestrator::test { From de2ae385ee1bdeea35335184606e937fd949bddb Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Tue, 3 Dec 2024 10:23:54 +0800 Subject: [PATCH 2/2] Revert CMake test change Signed-off-by: Luca Della Vedova --- nexus_workcell_orchestrator/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nexus_workcell_orchestrator/CMakeLists.txt b/nexus_workcell_orchestrator/CMakeLists.txt index ecd68a8..54edb39 100644 --- a/nexus_workcell_orchestrator/CMakeLists.txt +++ b/nexus_workcell_orchestrator/CMakeLists.txt @@ -94,7 +94,7 @@ if(BUILD_TESTING) # Adds a ament catch2 test with some common libraries. # Usage: nexus_add_test( ...) function(nexus_add_test target) - ament_add_catch2(${target} src/main_test.cpp ${ARGN}) + ament_add_catch2(${target} ${ARGN}) target_link_libraries(${target} PRIVATE ${PROJECT_NAME}_plugin nexus_common::nexus_common_test @@ -102,13 +102,18 @@ if(BUILD_TESTING) endfunction() nexus_add_test(serialization_tests + src/main_test.cpp src/serialization_test.cpp ) nexus_add_test(task_results_tests + src/main_test.cpp src/task_results_test.cpp ) nexus_add_test(transform_pose_test src/transform_pose_test.cpp) - nexus_add_test(job_manager_test src/job_manager_test.cpp) + nexus_add_test(job_manager_test + src/main_test.cpp + src/job_manager_test.cpp + ) endif() ament_package()