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) {
runSimpleStringTest(constantDataHolder);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
CompressionTest,
CompressionTest,
testing::Combine(
......@@ -357,7 +357,7 @@ TEST_P(CompressionVarintTest, ConstantData) {
runSimpleTest(constantDataHolder);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
CompressionVarintTest,
CompressionVarintTest,
testing::Combine(
......@@ -443,7 +443,7 @@ TEST_P(CompressionCorruptionTest, ConstantData) {
runSimpleTest(constantDataHolder);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
CompressionCorruptionTest,
CompressionCorruptionTest,
testing::ValuesIn(
......@@ -779,7 +779,7 @@ TEST_P(StreamingUnitTest, stateTransitions) {
codec_->compress(inBuffer.get());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
StreamingUnitTest,
StreamingUnitTest,
testing::ValuesIn(availableStreamCodecs()));
......@@ -989,7 +989,7 @@ TEST_P(StreamingCompressionTest, testFlush) {
runFlushTest(randomDataHolder);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
StreamingCompressionTest,
StreamingCompressionTest,
testing::Combine(
......@@ -1234,7 +1234,7 @@ TEST_P(AutomaticCodecTest, canUncompressOneBytes) {
EXPECT_FALSE(auto_->canUncompress(&buf, folly::none));
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
AutomaticCodecTest,
AutomaticCodecTest,
testing::ValuesIn(availableCodecs()));
......@@ -1318,7 +1318,7 @@ TEST_P(TerminalCodecTest, terminalOverridesDefaults) {
EXPECT_EQ(terminal->uncompress(compressed), "dummyString");
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TerminalCodecTest,
TerminalCodecTest,
testing::ValuesIn(autoUncompressionCodecTypes));
......@@ -1559,7 +1559,7 @@ TEST_P(ZlibOptionsTest, simpleRoundTripTest) {
runSimpleRoundTripTest(randomDataHolder);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ZlibOptionsTest,
ZlibOptionsTest,
testing::Combine(
......
......@@ -233,7 +233,7 @@ TEST_P(MeteredExecutorTestP, RequestContext) {
join();
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
MeteredExecutorSuite, MeteredExecutorTestP, testing::Values(1, 3));
TEST_F(MeteredExecutorTest, ResetJoins) {
......
......@@ -118,4 +118,4 @@ constexpr Params params[] = {
{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) {
}
#endif // FOLLY_HAS_COROUTINES
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
SimpleAsyncIOTests,
SimpleAsyncIOTest,
::testing::Values(
......
......@@ -120,7 +120,7 @@ TEST(FileGenBufferedTest, FileWriterSimple) {
byLine(File(file.path().string().c_str())) | eachTo<int>() | sum);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
DifferentBufferSizes,
FileGenBufferedTest,
::testing::Values(0, 1, 2, 4, 8, 64, 4096));
......@@ -699,7 +699,7 @@ TEST_P(FNVTest, Fnva64Partial) {
}
// Taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
FNVTesting,
FNVTest,
::testing::Values(
......
......@@ -133,7 +133,7 @@ std::vector<TFOState> getTestingValues() {
return vals;
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ConnectTests,
AsyncSocketConnectTest,
::testing::ValuesIn(getTestingValues()));
......@@ -3186,7 +3186,7 @@ class AsyncSocketErrMessageCallbackTest
}
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ErrMessageTests,
AsyncSocketErrMessageCallbackTest,
::testing::ValuesIn(AsyncSocketErrMessageCallbackTest::getTestingValues()));
......@@ -4553,7 +4553,7 @@ class AsyncSocketByteEventDetailsTest
}
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ByteEventDetailsTest,
AsyncSocketByteEventDetailsTest,
::testing::ValuesIn(AsyncSocketByteEventDetailsTest::getTestingValues()));
......@@ -4926,7 +4926,7 @@ class AsyncSocketByteEventHelperTimestampTest
}
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ByteEventTimestampTest,
AsyncSocketByteEventHelperTimestampTest,
::testing::ValuesIn(
......@@ -5196,7 +5196,7 @@ class AsyncSocketByteEventHelperOffsetTest
}
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ByteEventOffsetTest,
AsyncSocketByteEventHelperOffsetTest,
::testing::ValuesIn(
......
......@@ -631,7 +631,7 @@ TEST_P(
EXPECT_TRUE(pingClient->error());
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ConnectedAsyncSocketIntegrationTests,
ConnectedAsyncSocketIntegrationTest,
Values(BindSocket::YES, BindSocket::NO));
......
......@@ -1005,7 +1005,7 @@ TEST_P(MoveToFbStringTest, Simple) {
}
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
MoveToFbString,
MoveToFbStringTest,
::testing::Combine(
......
......@@ -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) {
folly::ssl::BioUniquePtr bio(BIO_new(BIO_s_file()));
......
......@@ -399,7 +399,7 @@ TEST_P(DistributionTest, ReasonableError) {
EXPECT_GE(reasonableError, stddev);
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ReasonableErrors,
DistributionTest,
::testing::Combine(
......
......@@ -1533,33 +1533,33 @@ static const vector<MaskBoundaryData> maskBoundaryProvider = {
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));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressFlagTest, ::testing::ValuesIn(flagProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressMappedTest, ::testing::ValuesIn(mapProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressCtorTest, ::testing::ValuesIn(invalidAddressProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress,
IPAddressCtorBinaryTest,
::testing::ValuesIn(invalidBinaryProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress, IPAddressMaskTest, ::testing::ValuesIn(masksProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress,
IPAddressMaskBoundaryTest,
::testing::ValuesIn(maskBoundaryProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress,
IPAddressByteAccessorTest,
::testing::ValuesIn(validAddressProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress,
IPAddressBitAccessorTest,
::testing::ValuesIn(validAddressProvider));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
IPAddress,
TryFromStringTest,
::testing::ValuesIn(TryFromStringTest::ipInOutProvider()));
......
......@@ -69,7 +69,7 @@ static std::vector<std::pair<double, double>> rateToConsumeSize = {
{10000, 5},
};
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
TokenBucket, TokenBucketTest, ::testing::ValuesIn(rateToConsumeSize));
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