Skip to content

Commit 6d4fb2d

Browse files
authored
fix tests for API break of passing controller manager update rate in init method (#854)
1 parent d9a6bb4 commit 6d4fb2d

File tree

18 files changed

+40
-40
lines changed

18 files changed

+40
-40
lines changed

ackermann_steering_controller/test/test_ackermann_steering_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class AckermannSteeringControllerFixture : public ::testing::Test
147147
protected:
148148
void SetUpController(const std::string controller_name = "test_ackermann_steering_controller")
149149
{
150-
ASSERT_EQ(controller_->init(controller_name, ""), controller_interface::return_type::OK);
150+
ASSERT_EQ(controller_->init(controller_name, "", 0), controller_interface::return_type::OK);
151151

152152
if (position_feedback_ == true)
153153
{

admittance_controller/test/test_admittance_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class AdmittanceControllerTest : public ::testing::Test
185185
controller_interface::return_type SetUpControllerCommon(
186186
const std::string & controller_name, const rclcpp::NodeOptions & options)
187187
{
188-
auto result = controller_->init(controller_name, "", "", options);
188+
auto result = controller_->init(controller_name, "", 0, "", options);
189189

190190
controller_->export_reference_interfaces();
191191
assign_interfaces();

bicycle_steering_controller/test/test_bicycle_steering_controller.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class BicycleSteeringControllerFixture : public ::testing::Test
144144
protected:
145145
void SetUpController(const std::string controller_name = "test_bicycle_steering_controller")
146146
{
147-
ASSERT_EQ(controller_->init(controller_name, ""), controller_interface::return_type::OK);
147+
ASSERT_EQ(controller_->init(controller_name, "", 0), controller_interface::return_type::OK);
148148

149149
if (position_feedback_ == true)
150150
{

diff_drive_controller/test/test_diff_drive_controller.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ class TestDiffDriveController : public ::testing::Test
195195

196196
TEST_F(TestDiffDriveController, configure_fails_without_parameters)
197197
{
198-
const auto ret = controller_->init(controller_name, urdf_);
198+
const auto ret = controller_->init(controller_name, urdf_, 0);
199199
ASSERT_EQ(ret, controller_interface::return_type::OK);
200200

201201
ASSERT_EQ(controller_->on_configure(rclcpp_lifecycle::State()), CallbackReturn::ERROR);
202202
}
203203

204204
TEST_F(TestDiffDriveController, configure_fails_with_only_left_or_only_right_side_defined)
205205
{
206-
const auto ret = controller_->init(controller_name, urdf_);
206+
const auto ret = controller_->init(controller_name, urdf_, 0);
207207
ASSERT_EQ(ret, controller_interface::return_type::OK);
208208

209209
controller_->get_node()->set_parameter(
@@ -223,7 +223,7 @@ TEST_F(TestDiffDriveController, configure_fails_with_only_left_or_only_right_sid
223223

224224
TEST_F(TestDiffDriveController, configure_fails_with_mismatching_wheel_side_size)
225225
{
226-
const auto ret = controller_->init(controller_name, urdf_);
226+
const auto ret = controller_->init(controller_name, urdf_, 0);
227227
ASSERT_EQ(ret, controller_interface::return_type::OK);
228228

229229
controller_->get_node()->set_parameter(
@@ -239,7 +239,7 @@ TEST_F(TestDiffDriveController, configure_fails_with_mismatching_wheel_side_size
239239

240240
TEST_F(TestDiffDriveController, configure_succeeds_when_wheels_are_specified)
241241
{
242-
const auto ret = controller_->init(controller_name, urdf_);
242+
const auto ret = controller_->init(controller_name, urdf_, 0);
243243
ASSERT_EQ(ret, controller_interface::return_type::OK);
244244

245245
controller_->get_node()->set_parameter(
@@ -259,7 +259,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_when_wheels_are_specified)
259259

260260
TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_false_no_namespace)
261261
{
262-
const auto ret = controller_->init(controller_name, urdf_);
262+
const auto ret = controller_->init(controller_name, urdf_, 0);
263263
ASSERT_EQ(ret, controller_interface::return_type::OK);
264264

265265
std::string odom_id = "odom";
@@ -292,7 +292,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_false_no_names
292292

293293
TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_true_no_namespace)
294294
{
295-
const auto ret = controller_->init(controller_name, urdf_);
295+
const auto ret = controller_->init(controller_name, urdf_, 0);
296296
ASSERT_EQ(ret, controller_interface::return_type::OK);
297297

298298
std::string odom_id = "odom";
@@ -327,7 +327,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_true_no_namesp
327327

328328
TEST_F(TestDiffDriveController, configure_succeeds_tf_blank_prefix_true_no_namespace)
329329
{
330-
const auto ret = controller_->init(controller_name, urdf_);
330+
const auto ret = controller_->init(controller_name, urdf_, 0);
331331
ASSERT_EQ(ret, controller_interface::return_type::OK);
332332

333333
std::string odom_id = "odom";
@@ -363,7 +363,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_false_set_name
363363
{
364364
std::string test_namespace = "/test_namespace";
365365

366-
const auto ret = controller_->init(controller_name, urdf_, test_namespace);
366+
const auto ret = controller_->init(controller_name, urdf_, 0, test_namespace);
367367
ASSERT_EQ(ret, controller_interface::return_type::OK);
368368

369369
std::string odom_id = "odom";
@@ -398,7 +398,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_test_prefix_true_set_names
398398
{
399399
std::string test_namespace = "/test_namespace";
400400

401-
const auto ret = controller_->init(controller_name, urdf_, test_namespace);
401+
const auto ret = controller_->init(controller_name, urdf_, 0, test_namespace);
402402
ASSERT_EQ(ret, controller_interface::return_type::OK);
403403

404404
std::string odom_id = "odom";
@@ -435,7 +435,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_blank_prefix_true_set_name
435435
{
436436
std::string test_namespace = "/test_namespace";
437437

438-
const auto ret = controller_->init(controller_name, urdf_, test_namespace);
438+
const auto ret = controller_->init(controller_name, urdf_, 0, test_namespace);
439439
ASSERT_EQ(ret, controller_interface::return_type::OK);
440440

441441
std::string odom_id = "odom";
@@ -469,7 +469,7 @@ TEST_F(TestDiffDriveController, configure_succeeds_tf_blank_prefix_true_set_name
469469

470470
TEST_F(TestDiffDriveController, activate_fails_without_resources_assigned)
471471
{
472-
const auto ret = controller_->init(controller_name, urdf_);
472+
const auto ret = controller_->init(controller_name, urdf_, 0);
473473
ASSERT_EQ(ret, controller_interface::return_type::OK);
474474

475475
controller_->get_node()->set_parameter(
@@ -483,7 +483,7 @@ TEST_F(TestDiffDriveController, activate_fails_without_resources_assigned)
483483

484484
TEST_F(TestDiffDriveController, activate_succeeds_with_pos_resources_assigned)
485485
{
486-
const auto ret = controller_->init(controller_name, urdf_);
486+
const auto ret = controller_->init(controller_name, urdf_, 0);
487487
ASSERT_EQ(ret, controller_interface::return_type::OK);
488488

489489
// We implicitly test that by default position feedback is required
@@ -499,7 +499,7 @@ TEST_F(TestDiffDriveController, activate_succeeds_with_pos_resources_assigned)
499499

500500
TEST_F(TestDiffDriveController, activate_succeeds_with_vel_resources_assigned)
501501
{
502-
const auto ret = controller_->init(controller_name, urdf_);
502+
const auto ret = controller_->init(controller_name, urdf_, 0);
503503
ASSERT_EQ(ret, controller_interface::return_type::OK);
504504

505505
controller_->get_node()->set_parameter(
@@ -516,7 +516,7 @@ TEST_F(TestDiffDriveController, activate_succeeds_with_vel_resources_assigned)
516516

517517
TEST_F(TestDiffDriveController, activate_fails_with_wrong_resources_assigned_1)
518518
{
519-
const auto ret = controller_->init(controller_name, urdf_);
519+
const auto ret = controller_->init(controller_name, urdf_, 0);
520520
ASSERT_EQ(ret, controller_interface::return_type::OK);
521521

522522
controller_->get_node()->set_parameter(
@@ -533,7 +533,7 @@ TEST_F(TestDiffDriveController, activate_fails_with_wrong_resources_assigned_1)
533533

534534
TEST_F(TestDiffDriveController, activate_fails_with_wrong_resources_assigned_2)
535535
{
536-
const auto ret = controller_->init(controller_name, urdf_);
536+
const auto ret = controller_->init(controller_name, urdf_, 0);
537537
ASSERT_EQ(ret, controller_interface::return_type::OK);
538538

539539
controller_->get_node()->set_parameter(
@@ -550,7 +550,7 @@ TEST_F(TestDiffDriveController, activate_fails_with_wrong_resources_assigned_2)
550550

551551
TEST_F(TestDiffDriveController, cleanup)
552552
{
553-
const auto ret = controller_->init(controller_name, urdf_);
553+
const auto ret = controller_->init(controller_name, urdf_, 0);
554554
ASSERT_EQ(ret, controller_interface::return_type::OK);
555555

556556
controller_->get_node()->set_parameter(
@@ -599,7 +599,7 @@ TEST_F(TestDiffDriveController, cleanup)
599599

600600
TEST_F(TestDiffDriveController, correct_initialization_using_parameters)
601601
{
602-
const auto ret = controller_->init(controller_name, urdf_);
602+
const auto ret = controller_->init(controller_name, urdf_, 0);
603603
ASSERT_EQ(ret, controller_interface::return_type::OK);
604604

605605
controller_->get_node()->set_parameter(

effort_controllers/test/test_joint_group_effort_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void JointGroupEffortControllerTest::TearDown() { controller_.reset(nullptr); }
5454

5555
void JointGroupEffortControllerTest::SetUpController()
5656
{
57-
const auto result = controller_->init("test_joint_group_effort_controller", "");
57+
const auto result = controller_->init("test_joint_group_effort_controller", "", 0);
5858
ASSERT_EQ(result, controller_interface::return_type::OK);
5959

6060
std::vector<LoanedCommandInterface> command_ifs;

force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void ForceTorqueSensorBroadcasterTest::TearDown() { fts_broadcaster_.reset(nullp
5353

5454
void ForceTorqueSensorBroadcasterTest::SetUpFTSBroadcaster()
5555
{
56-
const auto result = fts_broadcaster_->init("test_force_torque_sensor_broadcaster", "");
56+
const auto result = fts_broadcaster_->init("test_force_torque_sensor_broadcaster", "", 0);
5757
ASSERT_EQ(result, controller_interface::return_type::OK);
5858

5959
std::vector<LoanedStateInterface> state_ifs;

forward_command_controller/test/test_forward_command_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void ForwardCommandControllerTest::TearDown() { controller_.reset(nullptr); }
6060

6161
void ForwardCommandControllerTest::SetUpController()
6262
{
63-
const auto result = controller_->init("forward_command_controller", "");
63+
const auto result = controller_->init("forward_command_controller", "", 0);
6464
ASSERT_EQ(result, controller_interface::return_type::OK);
6565

6666
std::vector<LoanedCommandInterface> command_ifs;

forward_command_controller/test/test_multi_interface_forward_command_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void MultiInterfaceForwardCommandControllerTest::TearDown() { controller_.reset(
6262

6363
void MultiInterfaceForwardCommandControllerTest::SetUpController(bool set_params_and_activate)
6464
{
65-
const auto result = controller_->init("multi_interface_forward_command_controller", "");
65+
const auto result = controller_->init("multi_interface_forward_command_controller", "", 0);
6666
ASSERT_EQ(result, controller_interface::return_type::OK);
6767

6868
std::vector<LoanedCommandInterface> command_ifs;

gripper_controllers/test/test_gripper_controllers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void GripperControllerTest<T>::TearDown()
6060
template <typename T>
6161
void GripperControllerTest<T>::SetUpController()
6262
{
63-
const auto result = controller_->init("gripper_controller", "");
63+
const auto result = controller_->init("gripper_controller", "", 0);
6464
ASSERT_EQ(result, controller_interface::return_type::OK);
6565

6666
std::vector<LoanedCommandInterface> command_ifs;

imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void IMUSensorBroadcasterTest::TearDown() { imu_broadcaster_.reset(nullptr); }
5353

5454
void IMUSensorBroadcasterTest::SetUpIMUBroadcaster()
5555
{
56-
const auto result = imu_broadcaster_->init("test_imu_sensor_broadcaster", "");
56+
const auto result = imu_broadcaster_->init("test_imu_sensor_broadcaster", "", 0);
5757
ASSERT_EQ(result, controller_interface::return_type::OK);
5858

5959
std::vector<LoanedStateInterface> state_ifs;

0 commit comments

Comments
 (0)