Make folly build on platform010

Summary: GTest has changed some APIs, requiring that some _CASE flavors become _SUITEs. Codemodded those changes in.

Reviewed By: aary

Differential Revision: D32930335

fbshipit-source-id: e90e0c857fa683d5d08506045393d48de8cc9740

folly/concurrency/test/ConcurrentHashMapTest.cpp

@@ -35,7 +35,7 @@ DEFINE_int64(seed, 0, "Seed for random number generators");
 
 template <typename T>
 class ConcurrentHashMapTest : public ::testing::Test {};
-TYPED_TEST_CASE_P(ConcurrentHashMapTest);
+TYPED_TEST_SUITE_P(ConcurrentHashMapTest);
 
 template <template <
     typename,
@@ -1043,7 +1043,7 @@ TYPED_TEST_P(ConcurrentHashMapTest, EraseClonedNonCopyable) {
   EXPECT_EQ(iter->first, 256 * cloned);
 }
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     ConcurrentHashMapTest,
     MapTest,
     MaxSizeTest,
@@ -1096,5 +1096,5 @@ typedef ::testing::Types<MapFactory<BucketTable>, MapFactory<SIMDTable>>
 typedef ::testing::Types<MapFactory<BucketTable>> MapFactoryTypes;
 #endif
 
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     MapFactoryTypesInstantiation, ConcurrentHashMapTest, MapFactoryTypes);

folly/experimental/channels/test/ChannelTest.cpp

@@ -219,22 +219,22 @@ TEST_P(ChannelFixture, CancellationRespected) {
   EXPECT_TRUE(sender.isReceiverCancelled());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Coro_WithTry,
     ChannelFixture,
     testing::Values(ConsumptionMode::CoroWithTry));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Coro_WithoutTry,
     ChannelFixture,
     testing::Values(ConsumptionMode::CoroWithoutTry));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Callback_WithHandle,
     ChannelFixture,
     testing::Values(ConsumptionMode::CallbackWithHandle));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Callback_WithHandleList,
     ChannelFixture,
     testing::Values(ConsumptionMode::CallbackWithHandleList));
@@ -325,22 +325,22 @@ TEST_P(ChannelFixtureStress, Cancelled_ThenClosedImmediately_NoException) {
       AnyOf(Eq(CloseType::NoException), Eq(CloseType::Cancelled)));
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Coro_WithTry,
     ChannelFixtureStress,
     testing::Values(ConsumptionMode::CoroWithTry));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Coro_WithoutTry,
     ChannelFixtureStress,
     testing::Values(ConsumptionMode::CoroWithoutTry));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Callback_WithHandle,
     ChannelFixtureStress,
     testing::Values(ConsumptionMode::CallbackWithHandle));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Channel_Callback_WithHandleList,
     ChannelFixtureStress,
     testing::Values(ConsumptionMode::CallbackWithHandleList));

folly/experimental/coro/test/GtestHelpersTest.cpp

@@ -42,7 +42,7 @@ CO_TEST_P(GtestHelpersMultiplicationTest, BasicTest) {
   EXPECT_EQ(product, param.expectedProduct);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     GtestHelpersMultiplicationTest,
     GtestHelpersMultiplicationTest,
     ValuesIn(std::vector<GtestHelpersMultiplicationTestParam>{

folly/experimental/io/test/AsyncBaseTestLib.h

@@ -248,7 +248,7 @@ void testReads(
 
 template <typename T>
 class AsyncTest : public ::testing::Test {};
-TYPED_TEST_CASE_P(AsyncTest);
+TYPED_TEST_SUITE_P(AsyncTest);
 
 TYPED_TEST_P(AsyncTest, ZeroAsyncDataNotPollable) {
   test::async_base_test_lib_detail::testReads<TypeParam>(
@@ -473,7 +473,7 @@ TYPED_TEST_P(AsyncTest, Cancel) {
 // batch tests
 template <typename T>
 class AsyncBatchTest : public ::testing::Test {};
-TYPED_TEST_CASE_P(AsyncBatchTest);
+TYPED_TEST_SUITE_P(AsyncBatchTest);
 
 TYPED_TEST_P(AsyncBatchTest, BatchRead) {
   TypeParam aioReader;

folly/experimental/io/test/AsyncIOTest.cpp

@@ -23,7 +23,7 @@ namespace folly {
 namespace test {
 namespace async_base_test_lib_detail {
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     AsyncTest,
     ZeroAsyncDataNotPollable,
     ZeroAsyncDataPollable,
@@ -36,15 +36,15 @@ REGISTER_TYPED_TEST_CASE_P(
     NonBlockingWait,
     Cancel);
 
-REGISTER_TYPED_TEST_CASE_P(AsyncBatchTest, BatchRead);
+REGISTER_TYPED_TEST_SUITE_P(AsyncBatchTest, BatchRead);
 
-INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, AsyncIO);
+INSTANTIATE_TYPED_TEST_SUITE_P(AsyncTest, AsyncTest, AsyncIO);
 
 class BatchAsyncIO : public AsyncIO {
  public:
   BatchAsyncIO() : AsyncIO(kBatchNumEntries, folly::AsyncBase::NOT_POLLABLE) {}
 };
-INSTANTIATE_TYPED_TEST_CASE_P(AsyncBatchTest, AsyncBatchTest, BatchAsyncIO);
+INSTANTIATE_TYPED_TEST_SUITE_P(AsyncBatchTest, AsyncBatchTest, BatchAsyncIO);
 
 } // namespace async_base_test_lib_detail
 } // namespace test

folly/experimental/io/test/AsyncSignalHandlerTest.cpp

@@ -39,7 +39,7 @@ struct IoUringBackendProvider {
   }
 };
 
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     AsyncSignalHandlerTest, AsyncSignalHandlerTest, IoUringBackendProvider);
 } // namespace test
 } // namespace folly

folly/experimental/io/test/IoUringBackendTest.cpp

@@ -1221,7 +1221,7 @@ struct IoUringPollSQCQBackendProvider {
   }
 };
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     EventBaseTest,
     ReadEvent,
     ReadPersist,
@@ -1276,7 +1276,7 @@ REGISTER_TYPED_TEST_CASE_P(
     LoopKeepAliveAtomic,
     LoopKeepAliveCast);
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     EventBaseTest1,
     DrivableExecutorTest,
     IOExecutorTest,
@@ -1292,25 +1292,25 @@ REGISTER_TYPED_TEST_CASE_P(
     EventBaseExecutionObserver);
 
 // Instantiate the non registered fd tests
-INSTANTIATE_TYPED_TEST_CASE_P(IoUring, EventBaseTest, IoUringBackendProvider);
-INSTANTIATE_TYPED_TEST_CASE_P(IoUring, EventBaseTest1, IoUringBackendProvider);
+INSTANTIATE_TYPED_TEST_SUITE_P(IoUring, EventBaseTest, IoUringBackendProvider);
+INSTANTIATE_TYPED_TEST_SUITE_P(IoUring, EventBaseTest1, IoUringBackendProvider);
 
 // Instantiate the registered fd tests
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringRegFd, EventBaseTest, IoUringRegFdBackendProvider);
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringRegFd, EventBaseTest1, IoUringRegFdBackendProvider);
 
 // Instantiate the poll CQ tests
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringPollCQ, EventBaseTest, IoUringPollCQBackendProvider);
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringPollCQ, EventBaseTest1, IoUringPollCQBackendProvider);
 
 // Instantiate the poll SQ/CQ tests
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringPollSQCQ, EventBaseTest, IoUringPollCQBackendProvider);
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     IoUringPollSQCQ, EventBaseTest1, IoUringPollCQBackendProvider);
 } // namespace test
 } // namespace folly

folly/experimental/io/test/IoUringTest.cpp

@@ -23,7 +23,7 @@ using folly::IoUring;
 namespace folly {
 namespace test {
 namespace async_base_test_lib_detail {
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     AsyncTest,
     ZeroAsyncDataNotPollable,
     ZeroAsyncDataPollable,
@@ -36,9 +36,9 @@ REGISTER_TYPED_TEST_CASE_P(
     NonBlockingWait,
     Cancel);
 
-REGISTER_TYPED_TEST_CASE_P(AsyncBatchTest, BatchRead);
+REGISTER_TYPED_TEST_SUITE_P(AsyncBatchTest, BatchRead);
 
-INSTANTIATE_TYPED_TEST_CASE_P(AsyncTest, AsyncTest, IoUring);
+INSTANTIATE_TYPED_TEST_SUITE_P(AsyncTest, AsyncTest, IoUring);
 
 class BatchIoUring : public IoUring {
  public:
@@ -46,7 +46,7 @@ class BatchIoUring : public IoUring {
   BatchIoUring()
       : IoUring(kBatchNumEntries, folly::AsyncBase::NOT_POLLABLE, kMaxSubmit) {}
 };
-INSTANTIATE_TYPED_TEST_CASE_P(AsyncBatchTest, AsyncBatchTest, BatchIoUring);
+INSTANTIATE_TYPED_TEST_SUITE_P(AsyncBatchTest, AsyncBatchTest, BatchIoUring);
 
 TEST(IoUringTest, RegisteredBuffers) {
   constexpr size_t kNumEntries = 2;

folly/io/async/test/AsyncSignalHandlerTest.cpp

@@ -24,7 +24,7 @@ struct DefaultBackendProvider {
   }
 };
 
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     AsyncSignalHandlerTest, AsyncSignalHandlerTest, DefaultBackendProvider);
 
 TEST(AsyncSignalHandler, destructionOrder) {

folly/io/async/test/AsyncSignalHandlerTestLib.h

@@ -55,7 +55,7 @@ class AsyncSignalHandlerTest : public ::testing::Test {
   AsyncSignalHandlerTest() = default;
 };
 
-TYPED_TEST_CASE_P(AsyncSignalHandlerTest);
+TYPED_TEST_SUITE_P(AsyncSignalHandlerTest);
 
 TYPED_TEST_P(AsyncSignalHandlerTest, basic) {
   FOLLY_SKIP_IF_NULLPTR_BACKEND(evb);
@@ -88,6 +88,6 @@ TYPED_TEST_P(AsyncSignalHandlerTest, attachEventBase) {
   EXPECT_FALSE(handler.getEventBase());
 }
 
-REGISTER_TYPED_TEST_CASE_P(AsyncSignalHandlerTest, basic, attachEventBase);
+REGISTER_TYPED_TEST_SUITE_P(AsyncSignalHandlerTest, basic, attachEventBase);
 } // namespace test
 } // namespace folly

folly/io/async/test/EventBaseTest.cpp

@@ -21,7 +21,7 @@
 namespace folly {
 namespace test {
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     EventBaseTest,
     ReadEvent,
     ReadPersist,
@@ -76,7 +76,7 @@ REGISTER_TYPED_TEST_CASE_P(
     LoopKeepAliveAtomic,
     LoopKeepAliveCast);
 
-REGISTER_TYPED_TEST_CASE_P(
+REGISTER_TYPED_TEST_SUITE_P(
     EventBaseTest1,
     DrivableExecutorTest,
     IOExecutorTest,
@@ -96,9 +96,9 @@ struct DefaultBackendProvider {
     return folly::EventBase::getDefaultBackend();
   }
 };
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     EventBaseTest, EventBaseTest, DefaultBackendProvider);
-INSTANTIATE_TYPED_TEST_CASE_P(
+INSTANTIATE_TYPED_TEST_SUITE_P(
     EventBaseTest1, EventBaseTest1, DefaultBackendProvider);
 } // namespace test
 } // namespace folly

folly/io/async/test/EventBaseTestLib.h

@@ -84,7 +84,7 @@ class EventBaseTest : public EventBaseTestBase {
   EventBaseTest() = default;
 };
 
-TYPED_TEST_CASE_P(EventBaseTest);
+TYPED_TEST_SUITE_P(EventBaseTest);
 
 template <typename T>
 class EventBaseTest1 : public EventBaseTestBase {
@@ -113,7 +113,7 @@ std::unique_ptr<EventBase> getEventBase(
   }
 }
 
-TYPED_TEST_CASE_P(EventBaseTest1);
+TYPED_TEST_SUITE_P(EventBaseTest1);
 
 enum { BUF_SIZE = 4096 };
 

folly/net/test/TcpInfoTest.cpp

@@ -784,7 +784,7 @@ class TcpInfoTestCcParam
   }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     CcParamTests,
     TcpInfoTestCcParam,
     ::testing::ValuesIn(TcpInfoTestCcParam::getTestingValues()));

folly/synchronization/test/RelaxedAtomicTest.cpp

@@ -26,7 +26,7 @@ using RelaxedAtomicBooleanTestTypes = testing::Types<
     std::atomic<bool> volatile,
     folly::relaxed_atomic<bool>,
     folly::relaxed_atomic<bool> volatile>;
-TYPED_TEST_CASE(RelaxedAtomicBooleanTest, RelaxedAtomicBooleanTestTypes);
+TYPED_TEST_SUITE(RelaxedAtomicBooleanTest, RelaxedAtomicBooleanTestTypes);
 
 TYPED_TEST(RelaxedAtomicBooleanTest, is_lock_free) {
   TypeParam v{true};
@@ -86,7 +86,7 @@ using RelaxedAtomicPointerTestTypes = testing::Types<
     std::atomic<int*> volatile,
     folly::relaxed_atomic<int*>,
     folly::relaxed_atomic<int*> volatile>;
-TYPED_TEST_CASE(RelaxedAtomicPointerTest, RelaxedAtomicPointerTestTypes);
+TYPED_TEST_SUITE(RelaxedAtomicPointerTest, RelaxedAtomicPointerTestTypes);
 
 TYPED_TEST(RelaxedAtomicPointerTest, is_lock_free) {
   int n[] = {-1};
@@ -210,7 +210,7 @@ using RelaxedAtomicIntegralTestTypes = testing::Types<
     std::atomic<int> volatile,
     folly::relaxed_atomic<int>,
     folly::relaxed_atomic<int> volatile>;
-TYPED_TEST_CASE(RelaxedAtomicIntegralTest, RelaxedAtomicIntegralTestTypes);
+TYPED_TEST_SUITE(RelaxedAtomicIntegralTest, RelaxedAtomicIntegralTestTypes);
 
 TYPED_TEST(RelaxedAtomicIntegralTest, is_lock_free) {
   TypeParam v{3};