Skip to content

Commit ac35696

Browse files
authored
[jtc tests] avoid dangling ref of command / state interfaces (#1596)
1 parent cad5d40 commit ac35696

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

joint_trajectory_controller/test/test_trajectory_actions.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class TestTrajectoryActions : public TrajectoryControllerTest
122122
{
123123
TearDownControllerHardware();
124124
TearDownExecutor();
125+
TrajectoryControllerTest::TearDown();
125126
}
126127

127128
void TearDownExecutor()

joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,12 @@ class TrajectoryControllerTest : public ::testing::Test
259259
controller_name_ + "/joint_trajectory", rclcpp::SystemDefaultsQoS());
260260
}
261261

262+
void TearDown() override
263+
{
264+
DeactivateTrajectoryController();
265+
traj_controller_.reset();
266+
}
267+
262268
void SetUpTrajectoryController(
263269
rclcpp::Executor & executor, const std::vector<rclcpp::Parameter> & parameters = {},
264270
const std::string & urdf = ros2_control_test_assets::minimal_robot_urdf)
@@ -815,7 +821,7 @@ class TrajectoryControllerTestParameterized
815821
state_interface_types_ = std::get<1>(GetParam());
816822
}
817823

818-
virtual void TearDown() { TrajectoryControllerTest::DeactivateTrajectoryController(); }
824+
virtual void TearDown() { TrajectoryControllerTest::TearDown(); }
819825

820826
static void TearDownTestCase() { TrajectoryControllerTest::TearDownTestCase(); }
821827
};

0 commit comments

Comments
 (0)