Skip to content

Commit 0562e19

Browse files
Broadcasters
1 parent ab5de5f commit 0562e19

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ void ForceTorqueSensorBroadcasterTest::SetUp()
4848
fts_broadcaster_ = std::make_unique<FriendForceTorqueSensorBroadcaster>();
4949
}
5050

51-
void ForceTorqueSensorBroadcasterTest::TearDown() { fts_broadcaster_.reset(nullptr); }
51+
void ForceTorqueSensorBroadcasterTest::TearDown()
52+
{
53+
fts_broadcaster_->get_node()->shutdown();
54+
fts_broadcaster_.reset(nullptr); // this calls the dtor, but does not call shutdown transition
55+
}
5256

5357
void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
5458
{

imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ void IMUSensorBroadcasterTest::SetUp()
4848
imu_broadcaster_ = std::make_unique<FriendIMUSensorBroadcaster>();
4949
}
5050

51-
void IMUSensorBroadcasterTest::TearDown() { imu_broadcaster_.reset(nullptr); }
51+
void IMUSensorBroadcasterTest::TearDown()
52+
{
53+
imu_broadcaster_->get_node()->shutdown();
54+
imu_broadcaster_.reset(nullptr); // this calls the dtor, but does not call shutdown transition
55+
}
5256

5357
void IMUSensorBroadcasterTest::SetUpIMUBroadcaster()
5458
{

joint_state_broadcaster/test/test_joint_state_broadcaster.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ void JointStateBroadcasterTest::SetUp()
5757
state_broadcaster_ = std::make_unique<FriendJointStateBroadcaster>();
5858
}
5959

60-
void JointStateBroadcasterTest::TearDown() { state_broadcaster_.reset(nullptr); }
60+
void JointStateBroadcasterTest::TearDown()
61+
{
62+
state_broadcaster_->get_node()->shutdown();
63+
state_broadcaster_.reset(nullptr); // this calls the dtor, but does not call shutdown transition
64+
}
6165

6266
void JointStateBroadcasterTest::SetUpStateBroadcaster(
6367
const std::vector<std::string> & joint_names, const std::vector<std::string> & interfaces)

pose_broadcaster/test/test_pose_broadcaster.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ using hardware_interface::LoanedStateInterface;
2020

2121
void PoseBroadcasterTest::SetUp() { pose_broadcaster_ = std::make_unique<PoseBroadcaster>(); }
2222

23-
void PoseBroadcasterTest::TearDown() { pose_broadcaster_.reset(nullptr); }
23+
void PoseBroadcasterTest::TearDown()
24+
{
25+
pose_broadcaster_->get_node()->shutdown();
26+
pose_broadcaster_.reset(nullptr); // this calls the dtor, but does not call shutdown transition
27+
}
2428

2529
void PoseBroadcasterTest::SetUpPoseBroadcaster()
2630
{

range_sensor_broadcaster/test/test_range_sensor_broadcaster.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ void RangeSensorBroadcasterTest::SetUp()
3333
range_broadcaster_ = std::make_unique<range_sensor_broadcaster::RangeSensorBroadcaster>();
3434
}
3535

36-
void RangeSensorBroadcasterTest::TearDown() { range_broadcaster_.reset(nullptr); }
36+
void RangeSensorBroadcasterTest::TearDown()
37+
{
38+
range_broadcaster_->get_node()->shutdown();
39+
range_broadcaster_.reset(nullptr); // this calls the dtor, but does not call shutdown transition
40+
}
3741

3842
controller_interface::return_type RangeSensorBroadcasterTest::init_broadcaster(
3943
std::string broadcaster_name)

0 commit comments

Comments
 (0)