Skip to content

Commit 6591343

Browse files
dirk-thomasdirk-thomas
committed
update types using unique_identifier_msgs
1 parent 6c719b6 commit 6591343

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎rcl_action/test/rcl_action/test_action_communication.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_goal_c
166166
test_msgs__action__Fibonacci_SendGoal_Response__init(&incoming_goal_response);
167167

168168
// Initialize goal request
169-
init_test_uuid0(outgoing_goal_request.goal_id);
169+
init_test_uuid0(outgoing_goal_request.goal_id.uuid);
170170
outgoing_goal_request.goal.order = 10;
171171

172172
// Send goal request with valid arguments
@@ -203,8 +203,8 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_goal_c
203203
// Check that the goal request was received correctly
204204
EXPECT_EQ(outgoing_goal_request.goal.order, incoming_goal_request.goal.order);
205205
EXPECT_TRUE(uuidcmp(
206-
outgoing_goal_request.goal_id,
207-
incoming_goal_request.goal_id));
206+
outgoing_goal_request.goal_id.uuid,
207+
incoming_goal_request.goal_id.uuid));
208208

209209
// Initialize goal response
210210
outgoing_goal_response.accepted = true;
@@ -395,7 +395,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_result
395395
test_msgs__action__Fibonacci_GetResult_Response__init(&incoming_result_response);
396396

397397
// Initialize result request
398-
init_test_uuid0(outgoing_result_request.goal_id);
398+
init_test_uuid0(outgoing_result_request.goal_id.uuid);
399399

400400
// Send result request with valid arguments
401401
int64_t sequence_number;
@@ -430,8 +430,8 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_result
430430

431431
// Check that the result request was received correctly
432432
EXPECT_TRUE(uuidcmp(
433-
outgoing_result_request.goal_id,
434-
incoming_result_request.goal_id));
433+
outgoing_result_request.goal_id.uuid,
434+
incoming_result_request.goal_id.uuid));
435435

436436
// Initialize result response
437437
ASSERT_TRUE(rosidl_generator_c__int32__Sequence__init(
@@ -582,7 +582,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_feedba
582582
outgoing_feedback.feedback.sequence.data[0] = 0;
583583
outgoing_feedback.feedback.sequence.data[1] = 1;
584584
outgoing_feedback.feedback.sequence.data[2] = 2;
585-
init_test_uuid0(outgoing_feedback.goal_id);
585+
init_test_uuid0(outgoing_feedback.goal_id.uuid);
586586

587587
// Publish feedback with valid arguments
588588
rcl_ret_t ret = rcl_action_publish_feedback(&this->action_server, &outgoing_feedback);
@@ -617,8 +617,8 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_feedba
617617

618618
// Check that feedback was received correctly
619619
EXPECT_TRUE(uuidcmp(
620-
outgoing_feedback.goal_id,
621-
incoming_feedback.goal_id));
620+
outgoing_feedback.goal_id.uuid,
621+
incoming_feedback.goal_id.uuid));
622622
ASSERT_EQ(outgoing_feedback.feedback.sequence.size, incoming_feedback.feedback.sequence.size);
623623
EXPECT_TRUE(!memcmp(
624624
outgoing_feedback.feedback.sequence.data,
@@ -637,7 +637,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_goal
637637
test_msgs__action__Fibonacci_SendGoal_Request__init(&incoming_goal_request);
638638

639639
// Initialize goal request
640-
init_test_uuid0(outgoing_goal_request.goal_id);
640+
init_test_uuid0(outgoing_goal_request.goal_id.uuid);
641641
outgoing_goal_request.goal.order = 10;
642642
int64_t sequence_number = 1234;
643643
rcl_ret_t ret = 0;
@@ -876,7 +876,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_resu
876876
test_msgs__action__Fibonacci_GetResult_Request__init(&incoming_result_request);
877877

878878
// Initialize result request
879-
init_test_uuid0(outgoing_result_request.goal_id);
879+
init_test_uuid0(outgoing_result_request.goal_id.uuid);
880880

881881
// Send result request with null action client
882882
int64_t sequence_number = 1324;
@@ -999,7 +999,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_feed
999999
outgoing_feedback.feedback.sequence.data[0] = 0;
10001000
outgoing_feedback.feedback.sequence.data[1] = 1;
10011001
outgoing_feedback.feedback.sequence.data[2] = 2;
1002-
init_test_uuid0(outgoing_feedback.goal_id);
1002+
init_test_uuid0(outgoing_feedback.goal_id.uuid);
10031003

10041004
// Publish feedback with null action server
10051005
rcl_ret_t ret = rcl_action_publish_feedback(nullptr, &outgoing_feedback);

‎rcl_action/test/rcl_action/test_action_interaction.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class CLASSNAME (TestActionClientServerInteraction, RMW_IMPLEMENTATION) : public
197197
TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_interaction)
198198
{
199199
// Initialize goal request
200-
init_test_uuid0(this->outgoing_goal_request.goal_id);
200+
init_test_uuid0(this->outgoing_goal_request.goal_id.uuid);
201201
this->outgoing_goal_request.goal.order = 10;
202202

203203
// Send goal request with valid arguments
@@ -237,8 +237,8 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in
237237
// Check that the goal request was received correctly
238238
EXPECT_EQ(this->outgoing_goal_request.goal.order, this->incoming_goal_request.goal.order);
239239
EXPECT_TRUE(uuidcmp(
240-
this->outgoing_goal_request.goal_id,
241-
this->incoming_goal_request.goal_id));
240+
this->outgoing_goal_request.goal_id.uuid,
241+
this->incoming_goal_request.goal_id.uuid));
242242

243243
// Initialize goal response
244244
this->outgoing_goal_response.accepted = true;
@@ -288,7 +288,7 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in
288288
EXPECT_EQ(this->outgoing_goal_response.stamp.nanosec, this->incoming_goal_response.stamp.nanosec);
289289

290290
// Initialize result request
291-
init_test_uuid0(this->outgoing_result_request.goal_id);
291+
init_test_uuid0(this->outgoing_result_request.goal_id.uuid);
292292

293293
// Send result request with valid arguments
294294
ret = rcl_action_send_result_request(
@@ -301,7 +301,7 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in
301301
this->outgoing_feedback.feedback.sequence.data[0] = 0;
302302
this->outgoing_feedback.feedback.sequence.data[1] = 1;
303303
this->outgoing_feedback.feedback.sequence.data[2] = 2;
304-
init_test_uuid0(this->outgoing_feedback.goal_id);
304+
init_test_uuid0(this->outgoing_feedback.goal_id.uuid);
305305

306306
// Publish feedback with valid arguments
307307
ret = rcl_action_publish_feedback(&this->action_server, &this->outgoing_feedback);
@@ -339,8 +339,8 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in
339339

340340
// Check that feedback was received correctly
341341
EXPECT_TRUE(uuidcmp(
342-
this->outgoing_feedback.goal_id,
343-
this->incoming_feedback.goal_id));
342+
this->outgoing_feedback.goal_id.uuid,
343+
this->incoming_feedback.goal_id.uuid));
344344
ASSERT_EQ(
345345
this->outgoing_feedback.feedback.sequence.size,
346346
this->incoming_feedback.feedback.sequence.size);
@@ -379,8 +379,8 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in
379379

380380
// Check that the result request was received correctly
381381
EXPECT_TRUE(uuidcmp(
382-
this->outgoing_result_request.goal_id,
383-
this->incoming_result_request.goal_id));
382+
this->outgoing_result_request.goal_id.uuid,
383+
this->incoming_result_request.goal_id.uuid));
384384

385385
// Initialize result response
386386
ASSERT_TRUE(rosidl_generator_c__int32__Sequence__init(
@@ -458,7 +458,7 @@ TEST_F(
458458
action_msgs__srv__CancelGoal_Response__init(&incoming_cancel_response);
459459

460460
// Initialize goal request
461-
init_test_uuid0(this->outgoing_goal_request.goal_id);
461+
init_test_uuid0(this->outgoing_goal_request.goal_id.uuid);
462462
this->outgoing_goal_request.goal.order = 10;
463463

464464
// Send goal request with valid arguments
@@ -498,8 +498,8 @@ TEST_F(
498498
// Check that the goal request was received correctly
499499
EXPECT_EQ(this->outgoing_goal_request.goal.order, this->incoming_goal_request.goal.order);
500500
EXPECT_TRUE(uuidcmp(
501-
this->outgoing_goal_request.goal_id,
502-
this->incoming_goal_request.goal_id));
501+
this->outgoing_goal_request.goal_id.uuid,
502+
this->incoming_goal_request.goal_id.uuid));
503503

504504
// Initialize goal response
505505
this->outgoing_goal_response.accepted = true;
@@ -549,7 +549,7 @@ TEST_F(
549549
EXPECT_EQ(this->outgoing_goal_response.stamp.nanosec, this->incoming_goal_response.stamp.nanosec);
550550

551551
// Initialize result request
552-
init_test_uuid0(this->outgoing_result_request.goal_id);
552+
init_test_uuid0(this->outgoing_result_request.goal_id.uuid);
553553

554554
// Send result request with valid arguments
555555
ret = rcl_action_send_result_request(
@@ -562,7 +562,7 @@ TEST_F(
562562
this->outgoing_feedback.feedback.sequence.data[0] = 0;
563563
this->outgoing_feedback.feedback.sequence.data[1] = 1;
564564
this->outgoing_feedback.feedback.sequence.data[2] = 2;
565-
init_test_uuid0(this->outgoing_feedback.goal_id);
565+
init_test_uuid0(this->outgoing_feedback.goal_id.uuid);
566566

567567
// Publish feedback with valid arguments
568568
ret = rcl_action_publish_feedback(&this->action_server, &this->outgoing_feedback);
@@ -600,8 +600,8 @@ TEST_F(
600600

601601
// Check that feedback was received correctly
602602
EXPECT_TRUE(uuidcmp(
603-
this->outgoing_feedback.goal_id,
604-
this->incoming_feedback.goal_id));
603+
this->outgoing_feedback.goal_id.uuid,
604+
this->incoming_feedback.goal_id.uuid));
605605
ASSERT_EQ(
606606
this->outgoing_feedback.feedback.sequence.size,
607607
this->incoming_feedback.feedback.sequence.size);
@@ -640,8 +640,8 @@ TEST_F(
640640

641641
// Check that the result request was received correctly
642642
EXPECT_TRUE(uuidcmp(
643-
this->outgoing_result_request.goal_id,
644-
this->incoming_result_request.goal_id));
643+
this->outgoing_result_request.goal_id.uuid,
644+
this->incoming_result_request.goal_id.uuid));
645645

646646
// Initialize result response
647647
ASSERT_TRUE(rosidl_generator_c__int32__Sequence__init(

0 commit comments

Comments
 (0)