From b669cb8b1bb8a29fa40769cf1ce6a9cd922b5c35 Mon Sep 17 00:00:00 2001 From: Steven Murray Date: Sun, 18 Dec 2022 01:02:07 -0800 Subject: [PATCH] linter fixes --- .../test/test_controller_manager.cpp | 12 +++++------ .../test/test_load_controller.cpp | 20 ++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/controller_manager/test/test_controller_manager.cpp b/controller_manager/test/test_controller_manager.cpp index a92d7c061c2..54ec14f5620 100644 --- a/controller_manager/test/test_controller_manager.cpp +++ b/controller_manager/test/test_controller_manager.cpp @@ -105,8 +105,8 @@ TEST_P(TestControllerManager, controller_lifecycle) // configure controller auto configure_future = std::async( - std::launch::async, &controller_manager::ControllerManager::configure_controller, - cm_, test_controller::TEST_CONTROLLER_NAME); + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + test_controller::TEST_CONTROLLER_NAME); configure_future.wait_for(std::chrono::milliseconds(100)); EXPECT_EQ( controller_interface::return_type::OK, @@ -114,8 +114,8 @@ TEST_P(TestControllerManager, controller_lifecycle) EXPECT_EQ(configure_future.get(), controller_interface::return_type::OK); configure_future = std::async( - std::launch::async, &controller_manager::ControllerManager::configure_controller, - cm_, TEST_CONTROLLER2_NAME); + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + TEST_CONTROLLER2_NAME); configure_future.wait_for(std::chrono::milliseconds(100)); EXPECT_EQ( controller_interface::return_type::OK, @@ -232,8 +232,8 @@ TEST_P(TestControllerManager, per_controller_update_rate) // configure controller auto configure_future = std::async( - std::launch::async, &controller_manager::ControllerManager::configure_controller, - cm_, test_controller::TEST_CONTROLLER_NAME); + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + test_controller::TEST_CONTROLLER_NAME); configure_future.wait_for(std::chrono::milliseconds(100)); EXPECT_EQ( controller_interface::return_type::OK, diff --git a/controller_manager/test/test_load_controller.cpp b/controller_manager/test/test_load_controller.cpp index 78480ebabc0..3ff6ee67a22 100644 --- a/controller_manager/test/test_load_controller.cpp +++ b/controller_manager/test/test_load_controller.cpp @@ -162,10 +162,9 @@ TEST_P(TestLoadedControllerParametrized, starting_and_stopping_a_controller) lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id()); // Activate configured controller - auto configure_future = std::async(std::launch::async, - &controller_manager::ControllerManager::configure_controller, - cm_, - controller_name1); + auto configure_future = std::async( + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + controller_name1); configure_future.wait_for(std::chrono::milliseconds(100)); EXPECT_EQ( @@ -257,10 +256,9 @@ TEST_P(TestLoadedControllerParametrized, inactive_controller_cannot_be_configure // Configure from inactive state test_controller->simulate_cleanup_failure = false; - auto configure_future = std::async(std::launch::async, - &controller_manager::ControllerManager::configure_controller, - cm_, - controller_name1); + auto configure_future = std::async( + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + controller_name1); configure_future.wait_for(std::chrono::milliseconds(100)); EXPECT_EQ( @@ -443,10 +441,8 @@ TEST_P(TestTwoLoadedControllers, switch_multiple_controllers) lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if2->get_state().id()); auto configure_future = std::async( - std::launch::async, - &controller_manager::ControllerManager::configure_controller, - cm_, - controller_name2); + std::launch::async, &controller_manager::ControllerManager::configure_controller, cm_, + controller_name2); configure_future.wait_for(std::chrono::milliseconds(1000)); EXPECT_EQ( controller_interface::return_type::OK,