From 30a40956ba8358d7e406294c2cc80930d2c1af4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=2E=20Denis=20=C5=A0togl?= Date: Mon, 15 Jan 2024 21:49:40 +0100 Subject: [PATCH] Fix some other stuff. --- .../test/mock_components/test_generic_system.cpp | 10 +++++----- .../test_resource_manager_prepare_perform_switch.cpp | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hardware_interface/test/mock_components/test_generic_system.cpp b/hardware_interface/test/mock_components/test_generic_system.cpp index 0eb68d20527..41ce1d9041e 100644 --- a/hardware_interface/test/mock_components/test_generic_system.cpp +++ b/hardware_interface/test/mock_components/test_generic_system.cpp @@ -1205,7 +1205,7 @@ TEST_F(TestGenericSystem, generic_system_2dof_sensor_mock_command) auto urdf = ros2_control_test_assets::urdf_head + hardware_system_2dof_with_sensor_mock_command_ + ros2_control_test_assets::urdf_tail; - test_generic_system_with_mock_sensor_commands(urdf, "GenericSystem2dof"); + test_generic_system_with_mock_sensor_commands(urdf); } TEST_F(TestGenericSystem, generic_system_2dof_sensor_mock_command_True) @@ -1214,7 +1214,7 @@ TEST_F(TestGenericSystem, generic_system_2dof_sensor_mock_command_True) hardware_system_2dof_with_sensor_mock_command_True_ + ros2_control_test_assets::urdf_tail; - test_generic_system_with_mock_sensor_commands(urdf, "GenericSystem2dof"); + test_generic_system_with_mock_sensor_commands(urdf); } void TestGenericSystem::test_generic_system_with_mimic_joint(const std::string & urdf) @@ -1288,7 +1288,7 @@ TEST_F(TestGenericSystem, hardware_system_2dof_with_mimic_joint) auto urdf = ros2_control_test_assets::urdf_head + hardware_system_2dof_with_mimic_joint_ + ros2_control_test_assets::urdf_tail; - test_generic_system_with_mimic_joint(urdf, "GenericSystem2dof"); + test_generic_system_with_mimic_joint(urdf); } TEST_F(TestGenericSystem, generic_system_2dof_functionality_with_offset) @@ -1644,7 +1644,7 @@ TEST_F(TestGenericSystem, valid_urdf_ros2_control_system_robot_with_gpio_mock_co valid_urdf_ros2_control_system_robot_with_gpio_mock_command_ + ros2_control_test_assets::urdf_tail; - test_generic_system_with_mock_gpio_commands(urdf, "GenericSystem2dof"); + test_generic_system_with_mock_gpio_commands(urdf); } TEST_F(TestGenericSystem, valid_urdf_ros2_control_system_robot_with_gpio_mock_command_True) @@ -1653,7 +1653,7 @@ TEST_F(TestGenericSystem, valid_urdf_ros2_control_system_robot_with_gpio_mock_co valid_urdf_ros2_control_system_robot_with_gpio_mock_command_True_ + ros2_control_test_assets::urdf_tail; - test_generic_system_with_mock_gpio_commands(urdf, "GenericSystem2dof"); + test_generic_system_with_mock_gpio_commands(urdf); } TEST_F(TestGenericSystem, sensor_with_initial_value) diff --git a/hardware_interface/test/test_resource_manager_prepare_perform_switch.cpp b/hardware_interface/test/test_resource_manager_prepare_perform_switch.cpp index 8f6ba8f99a0..801eacb445b 100644 --- a/hardware_interface/test/test_resource_manager_prepare_perform_switch.cpp +++ b/hardware_interface/test/test_resource_manager_prepare_perform_switch.cpp @@ -20,6 +20,7 @@ #include #include "hardware_interface/loaned_state_interface.hpp" +#include "lifecycle_msgs/msg/state.hpp" #include "ros2_control_test_assets/descriptions.hpp" const auto hardware_resources_command_modes =