Skip to content

Commit 2382f22

Browse files
committed
fixed tests
1 parent 90cf593 commit 2382f22

File tree

1 file changed

+35
-5
lines changed

1 file changed

+35
-5
lines changed

hardware_interface/test/mock_components/test_generic_system.cpp

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2418,7 +2418,13 @@ TEST_F(TestGenericSystem, simple_dynamics_pos_control_modes_interfaces)
24182418
hardware_system_2dof_with_position_control_mode_position_state_only_ +
24192419
ros2_control_test_assets::urdf_tail;
24202420

2421-
TestableResourceManager rm(node_, urdf);
2421+
hardware_interface::ResourceManagerParams params;
2422+
params.robot_description = urdf;
2423+
params.clock = node_->get_clock();
2424+
params.logger = node_->get_logger();
2425+
params.executor = executor_;
2426+
2427+
TestableResourceManager rm(params, true);
24222428
// Activate components to get all interfaces available
24232429
activate_components(rm, {"MockHardwareSystem"});
24242430

@@ -2494,7 +2500,13 @@ TEST_F(TestGenericSystem, simple_dynamics_pos_control_modes_interfaces_w_offset)
24942500
ros2_control_test_assets::urdf_tail;
24952501
constexpr double offset = -3.0;
24962502

2497-
TestableResourceManager rm(node_, urdf);
2503+
hardware_interface::ResourceManagerParams params;
2504+
params.robot_description = urdf;
2505+
params.clock = node_->get_clock();
2506+
params.logger = node_->get_logger();
2507+
params.executor = executor_;
2508+
2509+
TestableResourceManager rm(params, true);
24982510
// Activate components to get all interfaces available
24992511
activate_components(rm, {"MockHardwareSystem"});
25002512

@@ -2569,7 +2581,13 @@ TEST_F(TestGenericSystem, simple_dynamics_vel_control_modes_interfaces)
25692581
hardware_system_2dof_with_velocity_control_mode_position_state_only_ +
25702582
ros2_control_test_assets::urdf_tail;
25712583

2572-
TestableResourceManager rm(node_, urdf);
2584+
hardware_interface::ResourceManagerParams params;
2585+
params.robot_description = urdf;
2586+
params.clock = node_->get_clock();
2587+
params.logger = node_->get_logger();
2588+
params.executor = executor_;
2589+
2590+
TestableResourceManager rm(params, true);
25732591
// Activate components to get all interfaces available
25742592
activate_components(rm, {"MockHardwareSystem"});
25752593

@@ -2645,7 +2663,13 @@ TEST_F(TestGenericSystem, simple_dynamics_vel_control_modes_interfaces_with_offs
26452663
ros2_control_test_assets::urdf_tail;
26462664
constexpr double offset = -3.0;
26472665

2648-
TestableResourceManager rm(node_, urdf);
2666+
hardware_interface::ResourceManagerParams params;
2667+
params.robot_description = urdf;
2668+
params.clock = node_->get_clock();
2669+
params.logger = node_->get_logger();
2670+
params.executor = executor_;
2671+
2672+
TestableResourceManager rm(params, true);
26492673
// Activate components to get all interfaces available
26502674
activate_components(rm, {"MockHardwareSystem"});
26512675

@@ -2829,7 +2853,13 @@ TEST_F(TestGenericSystem, perform_command_mode_switch_works_with_all_example_tag
28292853
[&](
28302854
const std::string & urdf, const std::string & urdf_head = ros2_control_test_assets::urdf_head)
28312855
{
2832-
TestableResourceManager rm(node_, urdf_head + urdf + ros2_control_test_assets::urdf_tail);
2856+
hardware_interface::ResourceManagerParams params;
2857+
params.robot_description = urdf_head + urdf + ros2_control_test_assets::urdf_tail;
2858+
params.clock = node_->get_clock();
2859+
params.logger = node_->get_logger();
2860+
params.executor = executor_;
2861+
2862+
TestableResourceManager rm(params, true);
28332863
rclcpp_lifecycle::State state(lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE, "active");
28342864
rm.set_component_state("MockHardwareSystem", state);
28352865
auto start_interfaces = rm.command_interface_keys();

0 commit comments

Comments
 (0)