@@ -37,17 +37,19 @@ class TestCleanupController : public ControllerManagerFixture<controller_manager
37
37
38
38
TEST_F (TestCleanupController, cleanup_unknown_controller)
39
39
{
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);
41
42
}
42
43
43
44
TEST_F (TestCleanupController, cleanup_controller_failed_init)
44
45
{
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);
49
49
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);
51
53
}
52
54
53
55
TEST_F (TestCleanupController, cleanup_non_loaded_controller_fails)
@@ -65,7 +67,8 @@ TEST_F(TestCleanupController, cleanup_unconfigured_controller)
65
67
ASSERT_EQ (
66
68
lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED, controller_if->get_state ().id ());
67
69
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 ());
69
72
}
70
73
71
74
TEST_F (TestCleanupController, cleanup_inactive_controller)
@@ -80,7 +83,8 @@ TEST_F(TestCleanupController, cleanup_inactive_controller)
80
83
81
84
EXPECT_EQ (lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE, controller_if->get_state ().id ());
82
85
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 ());
84
88
}
85
89
86
90
TEST_F (TestCleanupController, cleanup_active_controller)
@@ -97,6 +101,8 @@ TEST_F(TestCleanupController, cleanup_active_controller)
97
101
98
102
switch_test_controllers (strvec{CONTROLLER_NAME_1}, strvec{}, STRICT);
99
103
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 ());
102
108
}
0 commit comments