Commit 9ce8cd46 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

use INSTANTIATE_TEST_SUITE_P over INSTANTIATE_TEST_CASE_P

Summary: The facility was renamed in gtest.

Reviewed By: praihan

Differential Revision: D27985919

fbshipit-source-id: d35795d7bfb985767b5e6c28141dac47a4b9f0ce
parent 76f8268c
...@@ -300,7 +300,7 @@ TEST_P(CompressionTest, ConstantDataString) { ...@@ -300,7 +300,7 @@ TEST_P(CompressionTest, ConstantDataString) {
runSimpleStringTest(constantDataHolder); runSimpleStringTest(constantDataHolder);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CompressionTest, CompressionTest,
CompressionTest, CompressionTest,
testing::Combine( testing::Combine(
...@@ -357,7 +357,7 @@ TEST_P(CompressionVarintTest, ConstantData) { ...@@ -357,7 +357,7 @@ TEST_P(CompressionVarintTest, ConstantData) {
runSimpleTest(constantDataHolder); runSimpleTest(constantDataHolder);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CompressionVarintTest, CompressionVarintTest,
CompressionVarintTest, CompressionVarintTest,
testing::Combine( testing::Combine(
...@@ -443,7 +443,7 @@ TEST_P(CompressionCorruptionTest, ConstantData) { ...@@ -443,7 +443,7 @@ TEST_P(CompressionCorruptionTest, ConstantData) {
runSimpleTest(constantDataHolder); runSimpleTest(constantDataHolder);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CompressionCorruptionTest, CompressionCorruptionTest,
CompressionCorruptionTest, CompressionCorruptionTest,
testing::ValuesIn( testing::ValuesIn(
...@@ -779,7 +779,7 @@ TEST_P(StreamingUnitTest, stateTransitions) { ...@@ -779,7 +779,7 @@ TEST_P(StreamingUnitTest, stateTransitions) {
codec_->compress(inBuffer.get()); codec_->compress(inBuffer.get());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
StreamingUnitTest, StreamingUnitTest,
StreamingUnitTest, StreamingUnitTest,
testing::ValuesIn(availableStreamCodecs())); testing::ValuesIn(availableStreamCodecs()));
...@@ -989,7 +989,7 @@ TEST_P(StreamingCompressionTest, testFlush) { ...@@ -989,7 +989,7 @@ TEST_P(StreamingCompressionTest, testFlush) {
runFlushTest(randomDataHolder); runFlushTest(randomDataHolder);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
StreamingCompressionTest, StreamingCompressionTest,
StreamingCompressionTest, StreamingCompressionTest,
testing::Combine( testing::Combine(
...@@ -1234,7 +1234,7 @@ TEST_P(AutomaticCodecTest, canUncompressOneBytes) { ...@@ -1234,7 +1234,7 @@ TEST_P(AutomaticCodecTest, canUncompressOneBytes) {
EXPECT_FALSE(auto_->canUncompress(&buf, folly::none)); EXPECT_FALSE(auto_->canUncompress(&buf, folly::none));
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
AutomaticCodecTest, AutomaticCodecTest,
AutomaticCodecTest, AutomaticCodecTest,
testing::ValuesIn(availableCodecs())); testing::ValuesIn(availableCodecs()));
...@@ -1318,7 +1318,7 @@ TEST_P(TerminalCodecTest, terminalOverridesDefaults) { ...@@ -1318,7 +1318,7 @@ TEST_P(TerminalCodecTest, terminalOverridesDefaults) {
EXPECT_EQ(terminal->uncompress(compressed), "dummyString"); EXPECT_EQ(terminal->uncompress(compressed), "dummyString");
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TerminalCodecTest, TerminalCodecTest,
TerminalCodecTest, TerminalCodecTest,
testing::ValuesIn(autoUncompressionCodecTypes)); testing::ValuesIn(autoUncompressionCodecTypes));
...@@ -1559,7 +1559,7 @@ TEST_P(ZlibOptionsTest, simpleRoundTripTest) { ...@@ -1559,7 +1559,7 @@ TEST_P(ZlibOptionsTest, simpleRoundTripTest) {
runSimpleRoundTripTest(randomDataHolder); runSimpleRoundTripTest(randomDataHolder);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ZlibOptionsTest, ZlibOptionsTest,
ZlibOptionsTest, ZlibOptionsTest,
testing::Combine( testing::Combine(
......
...@@ -233,7 +233,7 @@ TEST_P(MeteredExecutorTestP, RequestContext) { ...@@ -233,7 +233,7 @@ TEST_P(MeteredExecutorTestP, RequestContext) {
join(); join();
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
MeteredExecutorSuite, MeteredExecutorTestP, testing::Values(1, 3)); MeteredExecutorSuite, MeteredExecutorTestP, testing::Values(1, 3));
TEST_F(MeteredExecutorTest, ResetJoins) { TEST_F(MeteredExecutorTest, ResetJoins) {
......
...@@ -118,4 +118,4 @@ constexpr Params params[] = { ...@@ -118,4 +118,4 @@ constexpr Params params[] = {
{true, false, false, true, false}, // tc async {true, false, false, true, false}, // tc async
}; };
INSTANTIATE_TEST_CASE_P(Foo, FlatCombiningTest, ::testing::ValuesIn(params)); INSTANTIATE_TEST_SUITE_P(Foo, FlatCombiningTest, ::testing::ValuesIn(params));
...@@ -209,7 +209,7 @@ TEST_P(SimpleAsyncIOTest, CoroutineReadWrite) { ...@@ -209,7 +209,7 @@ TEST_P(SimpleAsyncIOTest, CoroutineReadWrite) {
} }
#endif // FOLLY_HAS_COROUTINES #endif // FOLLY_HAS_COROUTINES
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SimpleAsyncIOTests, SimpleAsyncIOTests,
SimpleAsyncIOTest, SimpleAsyncIOTest,
::testing::Values( ::testing::Values(
......
...@@ -120,7 +120,7 @@ TEST(FileGenBufferedTest, FileWriterSimple) { ...@@ -120,7 +120,7 @@ TEST(FileGenBufferedTest, FileWriterSimple) {
byLine(File(file.path().string().c_str())) | eachTo<int>() | sum); byLine(File(file.path().string().c_str())) | eachTo<int>() | sum);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DifferentBufferSizes, DifferentBufferSizes,
FileGenBufferedTest, FileGenBufferedTest,
::testing::Values(0, 1, 2, 4, 8, 64, 4096)); ::testing::Values(0, 1, 2, 4, 8, 64, 4096));
...@@ -699,7 +699,7 @@ TEST_P(FNVTest, Fnva64Partial) { ...@@ -699,7 +699,7 @@ TEST_P(FNVTest, Fnva64Partial) {
} }
// Taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c // Taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
FNVTesting, FNVTesting,
FNVTest, FNVTest,
::testing::Values( ::testing::Values(
......
...@@ -133,7 +133,7 @@ std::vector<TFOState> getTestingValues() { ...@@ -133,7 +133,7 @@ std::vector<TFOState> getTestingValues() {
return vals; return vals;
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ConnectTests, ConnectTests,
AsyncSocketConnectTest, AsyncSocketConnectTest,
::testing::ValuesIn(getTestingValues())); ::testing::ValuesIn(getTestingValues()));
...@@ -3186,7 +3186,7 @@ class AsyncSocketErrMessageCallbackTest ...@@ -3186,7 +3186,7 @@ class AsyncSocketErrMessageCallbackTest
} }
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ErrMessageTests, ErrMessageTests,
AsyncSocketErrMessageCallbackTest, AsyncSocketErrMessageCallbackTest,
::testing::ValuesIn(AsyncSocketErrMessageCallbackTest::getTestingValues())); ::testing::ValuesIn(AsyncSocketErrMessageCallbackTest::getTestingValues()));
...@@ -4553,7 +4553,7 @@ class AsyncSocketByteEventDetailsTest ...@@ -4553,7 +4553,7 @@ class AsyncSocketByteEventDetailsTest
} }
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ByteEventDetailsTest, ByteEventDetailsTest,
AsyncSocketByteEventDetailsTest, AsyncSocketByteEventDetailsTest,
::testing::ValuesIn(AsyncSocketByteEventDetailsTest::getTestingValues())); ::testing::ValuesIn(AsyncSocketByteEventDetailsTest::getTestingValues()));
...@@ -4926,7 +4926,7 @@ class AsyncSocketByteEventHelperTimestampTest ...@@ -4926,7 +4926,7 @@ class AsyncSocketByteEventHelperTimestampTest
} }
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ByteEventTimestampTest, ByteEventTimestampTest,
AsyncSocketByteEventHelperTimestampTest, AsyncSocketByteEventHelperTimestampTest,
::testing::ValuesIn( ::testing::ValuesIn(
...@@ -5196,7 +5196,7 @@ class AsyncSocketByteEventHelperOffsetTest ...@@ -5196,7 +5196,7 @@ class AsyncSocketByteEventHelperOffsetTest
} }
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ByteEventOffsetTest, ByteEventOffsetTest,
AsyncSocketByteEventHelperOffsetTest, AsyncSocketByteEventHelperOffsetTest,
::testing::ValuesIn( ::testing::ValuesIn(
......
...@@ -631,7 +631,7 @@ TEST_P( ...@@ -631,7 +631,7 @@ TEST_P(
EXPECT_TRUE(pingClient->error()); EXPECT_TRUE(pingClient->error());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ConnectedAsyncSocketIntegrationTests, ConnectedAsyncSocketIntegrationTests,
ConnectedAsyncSocketIntegrationTest, ConnectedAsyncSocketIntegrationTest,
Values(BindSocket::YES, BindSocket::NO)); Values(BindSocket::YES, BindSocket::NO));
......
...@@ -1005,7 +1005,7 @@ TEST_P(MoveToFbStringTest, Simple) { ...@@ -1005,7 +1005,7 @@ TEST_P(MoveToFbStringTest, Simple) {
} }
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
MoveToFbString, MoveToFbString,
MoveToFbStringTest, MoveToFbStringTest,
::testing::Combine( ::testing::Combine(
......
...@@ -141,7 +141,7 @@ class OpenSSLCertUtilsTest : public TestWithParam<bool> { ...@@ -141,7 +141,7 @@ class OpenSSLCertUtilsTest : public TestWithParam<bool> {
} }
}; };
INSTANTIATE_TEST_CASE_P(OpenSSLCertUtilsTest, OpenSSLCertUtilsTest, Bool()); INSTANTIATE_TEST_SUITE_P(OpenSSLCertUtilsTest, OpenSSLCertUtilsTest, Bool());
static folly::ssl::X509UniquePtr readCertFromFile(const std::string& filename) { static folly::ssl::X509UniquePtr readCertFromFile(const std::string& filename) {
folly::ssl::BioUniquePtr bio(BIO_new(BIO_s_file())); folly::ssl::BioUniquePtr bio(BIO_new(BIO_s_file()));
......
...@@ -399,7 +399,7 @@ TEST_P(DistributionTest, ReasonableError) { ...@@ -399,7 +399,7 @@ TEST_P(DistributionTest, ReasonableError) {
EXPECT_GE(reasonableError, stddev); EXPECT_GE(reasonableError, stddev);
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ReasonableErrors, ReasonableErrors,
DistributionTest, DistributionTest,
::testing::Combine( ::testing::Combine(
......
...@@ -1533,33 +1533,33 @@ static const vector<MaskBoundaryData> maskBoundaryProvider = { ...@@ -1533,33 +1533,33 @@ static const vector<MaskBoundaryData> maskBoundaryProvider = {
MaskBoundaryData("2620:0:1cfe:face:b00c::1", 48, "2620:0:1cfc::", false), MaskBoundaryData("2620:0:1cfe:face:b00c::1", 48, "2620:0:1cfc::", false),
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressTest, ::testing::ValuesIn(validAddressProvider)); IPAddress, IPAddressTest, ::testing::ValuesIn(validAddressProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressFlagTest, ::testing::ValuesIn(flagProvider)); IPAddress, IPAddressFlagTest, ::testing::ValuesIn(flagProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressMappedTest, ::testing::ValuesIn(mapProvider)); IPAddress, IPAddressMappedTest, ::testing::ValuesIn(mapProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressCtorTest, ::testing::ValuesIn(invalidAddressProvider)); IPAddress, IPAddressCtorTest, ::testing::ValuesIn(invalidAddressProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddress,
IPAddressCtorBinaryTest, IPAddressCtorBinaryTest,
::testing::ValuesIn(invalidBinaryProvider)); ::testing::ValuesIn(invalidBinaryProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressMaskTest, ::testing::ValuesIn(masksProvider)); IPAddress, IPAddressMaskTest, ::testing::ValuesIn(masksProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddress,
IPAddressMaskBoundaryTest, IPAddressMaskBoundaryTest,
::testing::ValuesIn(maskBoundaryProvider)); ::testing::ValuesIn(maskBoundaryProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddress,
IPAddressByteAccessorTest, IPAddressByteAccessorTest,
::testing::ValuesIn(validAddressProvider)); ::testing::ValuesIn(validAddressProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddress,
IPAddressBitAccessorTest, IPAddressBitAccessorTest,
::testing::ValuesIn(validAddressProvider)); ::testing::ValuesIn(validAddressProvider));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddress,
TryFromStringTest, TryFromStringTest,
::testing::ValuesIn(TryFromStringTest::ipInOutProvider())); ::testing::ValuesIn(TryFromStringTest::ipInOutProvider()));
......
...@@ -69,7 +69,7 @@ static std::vector<std::pair<double, double>> rateToConsumeSize = { ...@@ -69,7 +69,7 @@ static std::vector<std::pair<double, double>> rateToConsumeSize = {
{10000, 5}, {10000, 5},
}; };
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TokenBucket, TokenBucketTest, ::testing::ValuesIn(rateToConsumeSize)); TokenBucket, TokenBucketTest, ::testing::ValuesIn(rateToConsumeSize));
TEST(TokenBucket, drainOnFail) { TEST(TokenBucket, drainOnFail) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment