Skip to content

Commit 418e47a

Browse files
committed
Correcting clang format and test case
1 parent 872c385 commit 418e47a

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

controller_manager/test/test_cleanup_controller.cpp

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,19 @@ class TestCleanupController : public ControllerManagerFixture<controller_manager
3737

3838
TEST_F(TestCleanupController, cleanup_unknown_controller)
3939
{
40-
ASSERT_EQ(cm_->cleanup_controller("unknown_controller_name"), controller_interface::return_type::ERROR);
40+
ASSERT_EQ(
41+
cm_->cleanup_controller("unknown_controller_name"), controller_interface::return_type::ERROR);
4142
}
4243

4344
TEST_F(TestCleanupController, cleanup_controller_failed_init)
4445
{
45-
auto controller_if =
46-
cm_->load_controller(
47-
"test_controller_failed_init",
48-
test_controller_failed_init::TEST_CONTROLLER_FAILED_INIT_CLASS_NAME);
46+
auto controller_if = cm_->load_controller(
47+
"test_controller_failed_init",
48+
test_controller_failed_init::TEST_CONTROLLER_FAILED_INIT_CLASS_NAME);
4949

50-
ASSERT_EQ(cm_->cleanup_controller("test_controller_failed_init"), controller_interface::return_type::ERROR);
50+
ASSERT_EQ(
51+
cm_->cleanup_controller("test_controller_failed_init"),
52+
controller_interface::return_type::ERROR);
5153
}
5254

5355
TEST_F(TestCleanupController, cleanup_non_loaded_controller_fails)
@@ -65,7 +67,8 @@ TEST_F(TestCleanupController, cleanup_unconfigured_controller)
6567
ASSERT_EQ(
6668
lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
6769
ASSERT_EQ(cm_->cleanup_controller(CONTROLLER_NAME_1), controller_interface::return_type::OK);
68-
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
70+
EXPECT_EQ(
71+
lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
6972
}
7073

7174
TEST_F(TestCleanupController, cleanup_inactive_controller)
@@ -80,7 +83,8 @@ TEST_F(TestCleanupController, cleanup_inactive_controller)
8083

8184
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE, controller_if->get_state().id());
8285
ASSERT_EQ(cm_->cleanup_controller(CONTROLLER_NAME_1), controller_interface::return_type::OK);
83-
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
86+
EXPECT_EQ(
87+
lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
8488
}
8589

8690
TEST_F(TestCleanupController, cleanup_active_controller)
@@ -97,6 +101,8 @@ TEST_F(TestCleanupController, cleanup_active_controller)
97101

98102
switch_test_controllers(strvec{CONTROLLER_NAME_1}, strvec{}, STRICT);
99103

100-
ASSERT_EQ(cm_->cleanup_controller(CONTROLLER_NAME_1), controller_interface::return_type::OK);
101-
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state().id());
104+
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE, controller_if->get_state().id());
105+
106+
ASSERT_EQ(cm_->cleanup_controller(CONTROLLER_NAME_1), controller_interface::return_type::ERROR);
107+
EXPECT_EQ(lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE, controller_if->get_state().id());
102108
}

0 commit comments

Comments
 (0)