Skip to content

Commit

Permalink
fix compilation issues after rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
@saikishor
saikishor committed Oct 17, 2024
1 parent 24b6938 commit 69095e5
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions controller_manager/test/test_controller_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,15 +769,15 @@ TEST_F(TestControllerManagerFallbackControllers, test_failure_on_fallback_contro
controller_spec.info.name = test_controller_1_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {test_controller_2_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2
}
EXPECT_EQ(2u, cm_->get_loaded_controllers().size());
Expand Down Expand Up @@ -851,15 +851,15 @@ TEST_F(TestControllerManagerFallbackControllers, test_fallback_controllers_activ
controller_spec.info.name = test_controller_1_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {test_controller_2_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2
}
EXPECT_EQ(2u, cm_->get_loaded_controllers().size());
Expand Down Expand Up @@ -949,15 +949,15 @@ TEST_F(
controller_spec.info.name = test_controller_1_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {test_controller_2_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2
}
EXPECT_EQ(2u, cm_->get_loaded_controllers().size());
Expand Down Expand Up @@ -1038,15 +1038,15 @@ TEST_F(
controller_spec.info.name = test_controller_1_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {test_controller_2_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2
}
EXPECT_EQ(2u, cm_->get_loaded_controllers().size());
Expand Down Expand Up @@ -1134,22 +1134,22 @@ TEST_F(
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {
test_controller_2_name, test_controller_3_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2

controller_spec.c = test_controller_3;
controller_spec.info.name = test_controller_3_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_3
}

Expand Down Expand Up @@ -1284,29 +1284,29 @@ TEST_F(
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {
test_controller_2_name, test_controller_3_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2

controller_spec.c = test_controller_3;
controller_spec.info.name = test_controller_3_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_3

controller_spec.c = test_controller_4;
controller_spec.info.name = test_controller_4_name;
controller_spec.info.type = "test_chainable_controller::TestChainableController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_4
}

Expand Down Expand Up @@ -1386,7 +1386,7 @@ TEST_F(
controller_spec.info.name = test_controller_1_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {test_controller_3_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_1

EXPECT_EQ(
Expand Down Expand Up @@ -1418,7 +1418,7 @@ TEST_F(
// available
controller_spec.info.fallback_controllers_names = {
test_controller_4_name, test_controller_3_name, test_controller_2_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_1

EXPECT_EQ(
Expand Down Expand Up @@ -1514,29 +1514,29 @@ TEST_F(
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {
test_controller_2_name, test_controller_4_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
ControllerManagerRunner cm_runner(this);
cm_->add_controller(controller_spec); // add controller_1

controller_spec.c = test_controller_2;
controller_spec.info.name = test_controller_2_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_2

controller_spec.c = test_controller_3;
controller_spec.info.name = test_controller_3_name;
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_3

controller_spec.c = test_controller_4;
controller_spec.info.name = test_controller_4_name;
controller_spec.info.type = "test_chainable_controller::TestChainableController";
controller_spec.info.fallback_controllers_names = {};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_4
}

Expand Down Expand Up @@ -1622,7 +1622,7 @@ TEST_F(
controller_spec.info.type = "test_controller::TestController";
controller_spec.info.fallback_controllers_names = {
test_controller_3_name, test_controller_4_name};
controller_spec.next_update_cycle_time = std::make_shared<rclcpp::Time>(0);
controller_spec.last_update_cycle_time = std::make_shared<rclcpp::Time>(0);
cm_->add_controller(controller_spec); // add controller_1

EXPECT_EQ(
Expand Down

0 comments on commit 69095e5

Please sign in to comment.