Skip to content

Commit ac8409a

Browse files
committed
Update deprecated gtest macros
1 parent 9ad5d5c commit ac8409a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

rcl/test/rcl/test_events.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ get_test_pubsub_incompatible_qos_inputs()
878878
return inputs;
879879
}
880880

881-
INSTANTIATE_TEST_CASE_P(
881+
INSTANTIATE_TEST_SUITE_P(
882882
TestPubSubIncompatibilityWithDifferentQosSettings,
883883
TestEventFixture,
884884
::testing::ValuesIn(get_test_pubsub_incompatible_qos_inputs()),

rcl/test/rcl/test_get_actual_qos.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
APPLY( \
4545
TEST_P, \
4646
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), test_name)
47-
#define INSTANTIATE_TEST_CASE_P_RMW(instance_name, test_case_name, ...) \
47+
#define INSTANTIATE_TEST_SUITE_P_RMW(instance_name, test_case_name, ...) \
4848
EXPAND( \
4949
APPLY( \
50-
INSTANTIATE_TEST_CASE_P, instance_name, \
50+
INSTANTIATE_TEST_SUITE_P, instance_name, \
5151
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), __VA_ARGS__))
5252

5353
/**
@@ -469,13 +469,13 @@ get_parameters(bool for_publisher)
469469
return parameters;
470470
}
471471

472-
INSTANTIATE_TEST_CASE_P_RMW(
472+
INSTANTIATE_TEST_SUITE_P_RMW(
473473
TestPublisherWithDifferentQoSSettings,
474474
TestPublisherGetActualQoS,
475475
::testing::ValuesIn(get_parameters(true)),
476476
::testing::PrintToStringParamName());
477477

478-
INSTANTIATE_TEST_CASE_P_RMW(
478+
INSTANTIATE_TEST_SUITE_P_RMW(
479479
TestSubscriptionWithDifferentQoSSettings,
480480
TestSubscriptionGetActualQoS,
481481
::testing::ValuesIn(get_parameters(false)),

rcl/test/rcl/test_logging_rosout.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
#define TEST_P_RMW(test_case_name, test_name) \
4242
APPLY( \
4343
TEST_P, CLASSNAME(test_case_name, RMW_IMPLEMENTATION), test_name)
44-
#define INSTANTIATE_TEST_CASE_P_RMW(instance_name, test_case_name, ...) \
44+
#define INSTANTIATE_TEST_SUITE_P_RMW(instance_name, test_case_name, ...) \
4545
EXPAND( \
4646
APPLY( \
47-
INSTANTIATE_TEST_CASE_P, instance_name, \
47+
INSTANTIATE_TEST_SUITE_P, instance_name, \
4848
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), __VA_ARGS__))
4949

5050
struct TestParameters
@@ -271,7 +271,7 @@ get_parameters()
271271
return parameters;
272272
}
273273

274-
INSTANTIATE_TEST_CASE_P_RMW(
274+
INSTANTIATE_TEST_SUITE_P_RMW(
275275
TestLoggingRosoutWithDifferentSettings,
276276
TestLoggingRosoutFixture,
277277
::testing::ValuesIn(get_parameters()),

rcl_action/test/rcl_action/test_goal_handle.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ const StateTransitionSequence valid_state_transition_sequences[] = {
315315
},
316316
};
317317

318-
INSTANTIATE_TEST_CASE_P(
318+
INSTANTIATE_TEST_SUITE_P(
319319
TestValidGoalHandleStateTransitions,
320320
TestGoalHandleStateTransitionSequence,
321321
::testing::ValuesIn(valid_state_transition_sequences),
@@ -347,7 +347,7 @@ const StateTransitionSequence invalid_state_transition_sequences[] = {
347347
},
348348
};
349349

350-
INSTANTIATE_TEST_CASE_P(
350+
INSTANTIATE_TEST_SUITE_P(
351351
TestInvalidGoalHandleStateTransitions,
352352
TestGoalHandleStateTransitionSequence,
353353
::testing::ValuesIn(invalid_state_transition_sequences),

rcl_action/test/rcl_action/test_names.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ const ActionDerivedNameTestSubject action_service_and_topic_subjects[] = {
154154
}
155155
};
156156

157-
INSTANTIATE_TEST_CASE_P(
157+
INSTANTIATE_TEST_SUITE_P(
158158
TestActionServiceAndTopicNames, TestActionDerivedName,
159159
::testing::ValuesIn(action_service_and_topic_subjects),
160160
::testing::PrintToStringParamName());

0 commit comments

Comments
 (0)