Convert use of deprecated macro
The macro INSTANTIATE_TEST_CASE_P is deprecated in favor of
INSTANTIATE_TEST_SUITE_P. Convert all uses cases of the old
macro name to the new one.
The deprecation is hidden by public dependency on the target
//third_party/jsoncpp that adds `-Wno-deprecated-declarations`
to the cflags.
It is necessary to fix dependencies before the jsoncpp config
can be fixed to re-enabled the warning.
The conversion is straight-forward, as the old macro and the
new one have exactly the same API (the old macro just call the
new one after printing a warning).
See //third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
Bug: 983223
Change-Id: I48dd7e5d094c7dab3afdcdf245192b23fe9f7453
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3423760
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Owners-Override: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/main@{#965206}
NOKEYCHECK=True
GitOrigin-RevId: 461f50d7762740294ed9119d9b6c154851714c9a
diff --git a/absl/random/beta_distribution_test.cc b/absl/random/beta_distribution_test.cc
index d980c96..2bbfe50 100644
--- a/absl/random/beta_distribution_test.cc
+++ b/absl/random/beta_distribution_test.cc
@@ -431,18 +431,22 @@
return absl::StrReplaceAll(name, {{"+", "_"}, {"-", "_"}, {".", "_"}});
}
-INSTANTIATE_TEST_CASE_P(
- TestSampleStatisticsCombinations, BetaDistributionTest,
+INSTANTIATE_TEST_SUITE_P(
+ TestSampleStatisticsCombinations,
+ BetaDistributionTest,
::testing::Combine(::testing::Values(0.1, 0.2, 0.9, 1.1, 2.5, 10.0, 123.4),
::testing::Values(0.1, 0.2, 0.9, 1.1, 2.5, 10.0, 123.4)),
ParamName);
-INSTANTIATE_TEST_CASE_P(
- TestSampleStatistics_SelectedPairs, BetaDistributionTest,
- ::testing::Values(std::make_pair(0.5, 1000), std::make_pair(1000, 0.5),
- std::make_pair(900, 1000), std::make_pair(10000, 20000),
- std::make_pair(4e5, 2e7), std::make_pair(1e7, 1e5)),
- ParamName);
+INSTANTIATE_TEST_SUITE_P(TestSampleStatistics_SelectedPairs,
+ BetaDistributionTest,
+ ::testing::Values(std::make_pair(0.5, 1000),
+ std::make_pair(1000, 0.5),
+ std::make_pair(900, 1000),
+ std::make_pair(10000, 20000),
+ std::make_pair(4e5, 2e7),
+ std::make_pair(1e7, 1e5)),
+ ParamName);
// NOTE: absl::beta_distribution is not guaranteed to be stable.
TEST(BetaDistributionTest, StabilityTest) {
diff --git a/absl/random/exponential_distribution_test.cc b/absl/random/exponential_distribution_test.cc
index 81a5d17..46bac51 100644
--- a/absl/random/exponential_distribution_test.cc
+++ b/absl/random/exponential_distribution_test.cc
@@ -343,8 +343,10 @@
return absl::StrReplaceAll(name, {{"+", "_"}, {"-", "_"}, {".", "_"}});
}
-INSTANTIATE_TEST_CASE_P(All, ExponentialDistributionTests,
- ::testing::ValuesIn(GenParams()), ParamName);
+INSTANTIATE_TEST_SUITE_P(All,
+ ExponentialDistributionTests,
+ ::testing::ValuesIn(GenParams()),
+ ParamName);
// NOTE: absl::exponential_distribution is not guaranteed to be stable.
TEST(ExponentialDistributionTest, StabilityTest) {