Skip to content

updated ros-tooling versions #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanStaschulat merged 3 commits into from
Sep 24, 2024
Merged

updated ros-tooling versions #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a236a3
updated ros-tooling versions
JanStaschulat Sep 24, 2024
140b38d
uncrustify test_action_client.cpp
JanStaschulat Sep 24, 2024
6d2a315
uncrustify test_action_server.cpp
JanStaschulat Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
image: ${{ matrix.docker_image }}
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.3
- uses: ros-tooling/setup-ros@0.7.9
with:
use-ros2-testing: true
required-ros-distributions: ${{ matrix.ros_distribution }}
Expand All @@ -35,7 +35,7 @@ jobs:
apt-get install ros-${{ matrix.ros_distribution }}-rclcpp-action
apt-get install ros-${{ matrix.ros_distribution }}-mimick-vendor
apt-get -y install ros-${{ matrix.ros_distribution }}-performance-test-fixture
- uses : ros-tooling/[email protected].5
- uses : ros-tooling/[email protected].13
with:
package-name: "rclc rclc_examples rclc_lifecycle rclc_parameter"
target-ros2-distro: ${{ matrix.ros_distribution }}
Expand Down
24 changes: 12 additions & 12 deletions rclc/test/rclc/test_action_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class ActionClientTest : public ::testing::Test

handle_feedback =
[&](rclc_action_goal_handle_t * /* goal_handle */, void * /* ros_feedback */,
void * /* context */) {};
void * /* context */) {};

// Init RCLCPP
using namespace std::placeholders;
Expand Down Expand Up @@ -352,7 +352,7 @@ TEST_F(ActionClientTest, goal_accept) {

// Prepare RCLCPP
server_handle_goal = [ = ](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
};
Expand Down Expand Up @@ -381,7 +381,7 @@ TEST_F(ActionClientTest, goal_reject) {

// Prepare RCLCPP
server_handle_goal = [ = ](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::REJECT;
};
Expand Down Expand Up @@ -414,7 +414,7 @@ TEST_F(ActionClientTest, goal_accept_feedback_and_result) {
// Prepare RCLCPP

server_handle_goal = [&](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
};
Expand Down Expand Up @@ -467,7 +467,7 @@ TEST_F(ActionClientTest, goal_accept_feedback_and_result) {
bool goal_result_received = false;
handle_result =
[&](rclc_action_goal_handle_t * /* goal_handle */, void * ros_result_response,
void * /* context */) {
void * /* context */) {
goal_result_received = true;

example_interfaces__action__Fibonacci_GetResult_Response * result =
Expand Down Expand Up @@ -499,7 +499,7 @@ TEST_F(ActionClientTest, goal_accept_feedback_and_abort) {
// Prepare RCLCPP

server_handle_goal = [&](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
};
Expand Down Expand Up @@ -552,7 +552,7 @@ TEST_F(ActionClientTest, goal_accept_feedback_and_abort) {
bool goal_result_received = false;
handle_result =
[&](rclc_action_goal_handle_t * /* goal_handle */, void * ros_result_response,
void * /* context */) {
void * /* context */) {
goal_result_received = true;

example_interfaces__action__Fibonacci_GetResult_Response * result =
Expand Down Expand Up @@ -584,7 +584,7 @@ TEST_F(ActionClientTest, goal_accept_cancel_success) {
// Prepare RCLCPP

server_handle_goal = [&](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
};
Expand Down Expand Up @@ -627,7 +627,7 @@ TEST_F(ActionClientTest, goal_accept_cancel_success) {
bool goal_result_received = false;
handle_result =
[&](rclc_action_goal_handle_t * /* goal_handle */, void * /* ros_result_response */,
void * /* context */) {
void * /* context */) {
goal_result_received = true;
};

Expand Down Expand Up @@ -668,7 +668,7 @@ TEST_F(ActionClientTest, goal_accept_cancel_reject) {
// Prepare RCLCPP

server_handle_goal = [&](const rclcpp_action::GoalUUID & /* uuid */,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request.goal.order, goal->order);
return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
};
Expand Down Expand Up @@ -727,7 +727,7 @@ TEST_F(ActionClientTest, goal_accept_cancel_reject) {
bool goal_result_received = false;
handle_result =
[&](rclc_action_goal_handle_t * /* goal_handle */, void * ros_result_response,
void * /* context */) {
void * /* context */) {
goal_result_received = true;

example_interfaces__action__Fibonacci_GetResult_Response * result =
Expand Down Expand Up @@ -787,7 +787,7 @@ TEST_F(ActionClientTest, multi_goal_accept_feedback_and_result) {

// Prepare RCLCPP
server_handle_goal = [&](const rclcpp_action::GoalUUID & uuid,
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
std::shared_ptr<const Fibonacci::Goal> goal) -> rclcpp_action::GoalResponse {
EXPECT_EQ(ros_goal_request[get_raw_uuid(uuid)].goal.order, goal->order);

return rclcpp_action::GoalResponse::ACCEPT_AND_EXECUTE;
Expand Down
6 changes: 3 additions & 3 deletions rclc/test/rclc/test_action_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ TEST_F(ActionServerTest, goal_accept_feedback_and_result) {
size_t feedback_received = 0;
send_goal_options.feedback_callback =
[&](GoalHandleFibonacci::SharedPtr,
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
feedback_received++;
ASSERT_EQ(feedback->sequence.size(), 3U);
};
Expand Down Expand Up @@ -444,7 +444,7 @@ TEST_F(ActionServerTest, goal_accept_feedback_and_abort) {
size_t feedback_received = 0;
send_goal_options.feedback_callback =
[&](GoalHandleFibonacci::SharedPtr,
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
feedback_received++;
ASSERT_EQ(feedback->sequence.size(), 3U);
};
Expand Down Expand Up @@ -648,7 +648,7 @@ TEST_F(ActionServerTest, multi_goal_accept_feedback_and_result) {
size_t feedback_received = 0;
send_goal_options.feedback_callback =
[&](GoalHandleFibonacci::SharedPtr goal_handle,
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
const std::shared_ptr<const Fibonacci::Feedback> feedback) -> void {
feedback_received++;
size_t feedback_size = goals[goal_handle->get_goal_id()];
ASSERT_EQ(feedback->sequence.size(), feedback_size);
Expand Down