Skip to content
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

Jump to bottom

Update deprecated gtest macros #818

Merged
merged 1 commit into from
Oct 20, 2020
Merged

Update deprecated gtest macros #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion rcl/test/rcl/test_events.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ get_test_pubsub_incompatible_qos_inputs()
return inputs;
}

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TestPubSubIncompatibilityWithDifferentQosSettings,
TestEventFixture,
::testing::ValuesIn(get_test_pubsub_incompatible_qos_inputs()),
Expand Down
8 changes: 4 additions & 4 deletions rcl/test/rcl/test_get_actual_qos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
APPLY( \
TEST_P, \
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), test_name)
#define INSTANTIATE_TEST_CASE_P_RMW(instance_name, test_case_name, ...) \
#define INSTANTIATE_TEST_SUITE_P_RMW(instance_name, test_case_name, ...) \
EXPAND( \
APPLY( \
INSTANTIATE_TEST_CASE_P, instance_name, \
INSTANTIATE_TEST_SUITE_P, instance_name, \
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), __VA_ARGS__))

/**
Expand Down Expand Up @@ -469,13 +469,13 @@ get_parameters(bool for_publisher)
return parameters;
}

INSTANTIATE_TEST_CASE_P_RMW(
INSTANTIATE_TEST_SUITE_P_RMW(
TestPublisherWithDifferentQoSSettings,
TestPublisherGetActualQoS,
::testing::ValuesIn(get_parameters(true)),
::testing::PrintToStringParamName());

INSTANTIATE_TEST_CASE_P_RMW(
INSTANTIATE_TEST_SUITE_P_RMW(
TestSubscriptionWithDifferentQoSSettings,
TestSubscriptionGetActualQoS,
::testing::ValuesIn(get_parameters(false)),
Expand Down
6 changes: 3 additions & 3 deletions rcl/test/rcl/test_logging_rosout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
#define TEST_P_RMW(test_case_name, test_name) \
APPLY( \
TEST_P, CLASSNAME(test_case_name, RMW_IMPLEMENTATION), test_name)
#define INSTANTIATE_TEST_CASE_P_RMW(instance_name, test_case_name, ...) \
#define INSTANTIATE_TEST_SUITE_P_RMW(instance_name, test_case_name, ...) \
EXPAND( \
APPLY( \
INSTANTIATE_TEST_CASE_P, instance_name, \
INSTANTIATE_TEST_SUITE_P, instance_name, \
CLASSNAME(test_case_name, RMW_IMPLEMENTATION), __VA_ARGS__))

struct TestParameters
Expand Down Expand Up @@ -271,7 +271,7 @@ get_parameters()
return parameters;
}

INSTANTIATE_TEST_CASE_P_RMW(
INSTANTIATE_TEST_SUITE_P_RMW(
TestLoggingRosoutWithDifferentSettings,
TestLoggingRosoutFixture,
::testing::ValuesIn(get_parameters()),
Expand Down
4 changes: 2 additions & 2 deletions rcl_action/test/rcl_action/test_goal_handle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ const StateTransitionSequence valid_state_transition_sequences[] = {
},
};

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TestValidGoalHandleStateTransitions,
TestGoalHandleStateTransitionSequence,
::testing::ValuesIn(valid_state_transition_sequences),
Expand Down Expand Up @@ -347,7 +347,7 @@ const StateTransitionSequence invalid_state_transition_sequences[] = {
},
};

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TestInvalidGoalHandleStateTransitions,
TestGoalHandleStateTransitionSequence,
::testing::ValuesIn(invalid_state_transition_sequences),
Expand Down
2 changes: 1 addition & 1 deletion rcl_action/test/rcl_action/test_names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const ActionDerivedNameTestSubject action_service_and_topic_subjects[] = {
}
};

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TestActionServiceAndTopicNames, TestActionDerivedName,
::testing::ValuesIn(action_service_and_topic_subjects),
::testing::PrintToStringParamName());