From 0ab0e6587a4650f8984a8c99230ec8400c1649ef Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 3 Dec 2023 21:39:54 +0000 Subject: [PATCH] Fix merge conflicts --- hardware_interface/test/test_resource_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hardware_interface/test/test_resource_manager.cpp b/hardware_interface/test/test_resource_manager.cpp index b8a7ae4dd2..0230972d2d 100644 --- a/hardware_interface/test/test_resource_manager.cpp +++ b/hardware_interface/test/test_resource_manager.cpp @@ -1389,7 +1389,7 @@ TEST_F(ResourceManagerTest, managing_controllers_reference_interfaces) rm.make_controller_reference_interfaces_unavailable("unknown_controller"), std::out_of_range); } -class TestResourceManagerReadWriteError : public TestResourceManager +class TestResourceManagerReadWriteError : public ResourceManagerTest { public: void setup_resource_manager_and_do_initial_checks() @@ -1604,7 +1604,7 @@ TEST_F(TestResourceManagerReadWriteError, handle_error_on_hardware_write) std::bind(&hardware_interface::ResourceManager::read, rm, _1, _2), WRITE_FAIL_VALUE); } -TEST_F(TestResourceManager, test_caching_of_controllers_to_hardware) +TEST_F(ResourceManagerTest, test_caching_of_controllers_to_hardware) { hardware_interface::ResourceManager rm(ros2_control_test_assets::minimal_robot_urdf, false); activate_components(rm);