Migrate from googletest 1.8 to googletest 1.10 (#67)

Summary: X-link: facebookincubator/hsthrift#67 Updating `googletest` from `1.8.0` to `1.10.0` Reviewed By: mzlee, igorsugak, luciang, meyering, r-barnes Differential Revision: D34351084 fbshipit-source-id: 939b3985ab63a06b6d511ec8711c2d5863bdfea8
facebook · Mar 3, 2022 · 1512856 · 1512856
1 parent 7ae2cc2
commit 1512856
Show file tree

Hide file tree

Showing 43 changed files with 750 additions and 940 deletions.
diff --git a/build/fbcode_builder/manifests/mvfst b/build/fbcode_builder/manifests/mvfst
@@ -25,7 +25,7 @@ folly
 fizz
 
 [dependencies.all(test=on, not(os=windows))]
-googletest_1_8
+googletest
 
 [shipit.pathmap]
 fbcode/quic/public_root = .

diff --git a/build/fbcode_builder/manifests/proxygen b/build/fbcode_builder/manifests/proxygen
@@ -32,7 +32,7 @@ wangle
 mvfst
 
 [dependencies.test=on]
-googletest_1_8
+googletest
 
 [shipit.pathmap]
 fbcode/proxygen/public_tld = .

diff --git a/cmake/ProxygenTest.cmake b/cmake/ProxygenTest.cmake
@@ -7,8 +7,8 @@
 option(BUILD_TESTS  "Enable tests" OFF)
 include(CTest)
 if(BUILD_TESTS)
-  find_package(GMock 1.8.0 MODULE REQUIRED)
-  find_package(GTest 1.8.0 MODULE REQUIRED)
+  find_package(GMock 1.10.0 MODULE REQUIRED)
+  find_package(GTest 1.10.0 MODULE REQUIRED)
 endif()
 
 function(proxygen_add_test)
@@ -29,7 +29,7 @@ function(proxygen_add_test)
       set(PROXYGEN_TEST_SOURCES "${PROXYGEN_TEST_TARGET}.cpp")
     endif()
 
-    add_executable(${PROXYGEN_TEST_TARGET} 
+    add_executable(${PROXYGEN_TEST_TARGET}
       "${PROXYGEN_TEST_SOURCES}"
     )
 

diff --git a/proxygen/build.sh b/proxygen/build.sh
@@ -159,7 +159,7 @@ function setup_googletest() {
   fi
   cd "$GTEST_DIR"
   git fetch --tags
-  git checkout release-1.8.0
+  git checkout release-1.10.0
   echo -e "${COLOR_GREEN}Building googletest ${COLOR_OFF}"
   mkdir -p "$GTEST_BUILD_DIR"
   cd "$GTEST_BUILD_DIR" || exit

diff --git a/proxygen/httpserver/Mocks.h b/proxygen/httpserver/Mocks.h
@@ -29,8 +29,6 @@ class MockResponseHandler : public ResponseHandler {
 #endif
 #endif
 
-// googletest switched APIs between multiple versions we target
-#if defined(MOCK_METHOD)
   MOCK_METHOD((void), pauseIngress, (), (noexcept));
   MOCK_METHOD((void), refreshTimeout, (), (noexcept));
   MOCK_METHOD((void), resumeIngress, (), (noexcept));
@@ -45,26 +43,8 @@ class MockResponseHandler : public ResponseHandler {
               newPushedResponse,
               (PushHandler*),
               (noexcept));
-#else
-  GMOCK_METHOD0_(, noexcept, , pauseIngress, void());
-  GMOCK_METHOD0_(, noexcept, , refreshTimeout, void());
-  GMOCK_METHOD0_(, noexcept, , resumeIngress, void());
-  GMOCK_METHOD0_(, noexcept, , sendAbort, void());
-  GMOCK_METHOD0_(, noexcept, , sendChunkTerminator, void());
-  GMOCK_METHOD0_(, noexcept, , sendEOM, void());
-  GMOCK_METHOD1_(, noexcept, , sendBody, void(std::shared_ptr<folly::IOBuf>));
-  GMOCK_METHOD1_(, noexcept, , sendChunkHeader, void(size_t));
-  GMOCK_METHOD1_(, noexcept, , sendHeaders, void(HTTPMessage&));
-  GMOCK_METHOD1_(, noexcept, , sendTrailers, void(const HTTPHeaders&));
-  GMOCK_METHOD1_(
-      ,
-      noexcept,
-      ,
-      newPushedResponse,
-      folly::Expected<ResponseHandler*, ProxygenError>(PushHandler*));
-#endif
+  MOCK_METHOD(void, getCurrentTransportInfo, (wangle::TransportInfo*), (const));
 
-  MOCK_CONST_METHOD1(getCurrentTransportInfo, void(wangle::TransportInfo*));
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
@@ -92,7 +72,6 @@ class MockRequestHandler : public RequestHandler {
 #pragma clang diagnostic ignored "-Winconsistent-missing-override"
 #endif
 #endif
-#if defined(MOCK_METHOD)
   MOCK_METHOD((bool), canHandleExpect, (), (noexcept));
   MOCK_METHOD((void), onBody, (std::shared_ptr<folly::IOBuf>), (noexcept));
   MOCK_METHOD((void), onEOM, (), (noexcept));
@@ -104,19 +83,7 @@ class MockRequestHandler : public RequestHandler {
   MOCK_METHOD((void), onUpgrade, (UpgradeProtocol), (noexcept));
   MOCK_METHOD((void), requestComplete, (), (noexcept));
   MOCK_METHOD((void), setResponseHandler, (ResponseHandler*), (noexcept));
-#else
-  GMOCK_METHOD0_(, noexcept, , onEOM, void());
-  GMOCK_METHOD0_(, noexcept, , onEgressPaused, void());
-  GMOCK_METHOD0_(, noexcept, , requestComplete, void());
-  GMOCK_METHOD1_(, noexcept, , onBody, void(std::shared_ptr<folly::IOBuf>));
-  GMOCK_METHOD1_(, noexcept, , onError, void(ProxygenError));
-  GMOCK_METHOD1_(, noexcept, , onGoaway, void(ErrorCode));
-  GMOCK_METHOD1_(, noexcept, , onRequest, void(std::shared_ptr<HTTPMessage>));
-  GMOCK_METHOD1_(, noexcept, , onUpgrade, void(UpgradeProtocol));
-  GMOCK_METHOD1_(, noexcept, , setResponseHandler, void(ResponseHandler*));
-  GMOCK_METHOD0_(, noexcept, , onEgressResumed, void());
-  GMOCK_METHOD0_(, noexcept, , canHandleExpect, bool());
-#endif
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif

diff --git a/proxygen/httpserver/filters/tests/CompressionFilterTest.cpp b/proxygen/httpserver/filters/tests/CompressionFilterTest.cpp
@@ -261,7 +261,7 @@ class CompressionFilterTest : public Test {
 
 typedef ::testing::Types<ZlibTest, ZstdTest> CompressionCodecs;
 
-TYPED_TEST_CASE(CompressionFilterTest, CompressionCodecs);
+TYPED_TEST_SUITE(CompressionFilterTest, CompressionCodecs);
 
 // Basic smoke test
 TYPED_TEST(CompressionFilterTest, NonchunkedCompression) {

diff --git a/proxygen/httpserver/samples/echo/test/EchoHandlerTest.cpp b/proxygen/httpserver/samples/echo/test/EchoHandlerTest.cpp
@@ -19,8 +19,8 @@ using namespace testing;
 
 class MockEchoStats : public EchoStats {
  public:
-  MOCK_METHOD0(recordRequest, void());
-  MOCK_METHOD0(getRequestCount, uint64_t());
+  MOCK_METHOD(void, recordRequest, ());
+  MOCK_METHOD(uint64_t, getRequestCount, ());
 };
 
 class EchoHandlerFixture : public testing::Test {

diff --git a/proxygen/httpserver/tests/HTTPServerTest.cpp b/proxygen/httpserver/tests/HTTPServerTest.cpp
@@ -193,20 +193,12 @@ TEST(HttpServerStartStop, TestUseExistingIoExecutor) {
 
 class MockRequestHandlerFactory : public RequestHandlerFactory {
  public:
-// googletest switched APIs between multiple versions we target
-#if defined(MOCK_METHOD)
   MOCK_METHOD((void), onServerStart, (folly::EventBase*), (noexcept));
   MOCK_METHOD((void), onServerStop, (), (noexcept));
   MOCK_METHOD((RequestHandler*),
               onRequest,
               (RequestHandler*, HTTPMessage*),
               (noexcept));
-#else
-  GMOCK_METHOD1_(, noexcept, , onServerStart, void(folly::EventBase* evb));
-  GMOCK_METHOD0_(, noexcept, , onServerStop, void());
-  GMOCK_METHOD2_(
-      , noexcept, , onRequest, RequestHandler*(RequestHandler*, HTTPMessage*));
-#endif
 };
 
 TEST(HttpServerStartStop, TestZeroThreadsMeansNumCPUs) {

diff --git a/proxygen/lib/http/codec/compress/experimental/simulator/HPACKQueueTests.cpp b/proxygen/lib/http/codec/compress/experimental/simulator/HPACKQueueTests.cpp
@@ -150,4 +150,4 @@ TEST_P(HPACKQueueTests, QueueDeleted) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(Queue, HPACKQueueTests, ::testing::Values(0, 1, 2, 3));
+INSTANTIATE_TEST_SUITE_P(Queue, HPACKQueueTests, ::testing::Values(0, 1, 2, 3));
diff --git a/proxygen/lib/http/codec/compress/test/HPACKContextTests.cpp b/proxygen/lib/http/codec/compress/test/HPACKContextTests.cpp
@@ -320,6 +320,6 @@ TEST_P(HPACKContextTests, ContextUpdate) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(Context,
-                        HPACKContextTests,
-                        ::testing::Values(true, false));
+INSTANTIATE_TEST_SUITE_P(Context,
+                         HPACKContextTests,
+                         ::testing::Values(true, false));
diff --git a/proxygen/lib/http/codec/compress/test/RFCExamplesTests.cpp b/proxygen/lib/http/codec/compress/test/RFCExamplesTests.cpp
@@ -142,7 +142,7 @@ TEST_P(RFCRequestTest, RfcExampleRequest) {
   EXPECT_EQ(encoder.getTable().size(), 3);
 }
 
-INSTANTIATE_TEST_CASE_P(Huffman, RFCRequestTest, ::testing::Values(d3, d4));
+INSTANTIATE_TEST_SUITE_P(Huffman, RFCRequestTest, ::testing::Values(d3, d4));
 
 TEST_P(RFCResponseTest, RfcExampleResponse) {
   // this test does some evictions
@@ -172,4 +172,4 @@ TEST_P(RFCResponseTest, RfcExampleResponse) {
   EXPECT_EQ(encoder.getTable().bytes(), 215);
 }
 
-INSTANTIATE_TEST_CASE_P(Huffman, RFCResponseTest, ::testing::Values(d5, d6));
+INSTANTIATE_TEST_SUITE_P(Huffman, RFCResponseTest, ::testing::Values(d5, d6));
diff --git a/proxygen/lib/http/codec/test/DefaultHTTPCodecFactoryTest.cpp b/proxygen/lib/http/codec/test/DefaultHTTPCodecFactoryTest.cpp
@@ -71,6 +71,6 @@ TEST_P(DefaultHTTPCodecFactoryValidationTest, StrictValidation) {
   EXPECT_EQ(callbacks.streamErrors, strict ? 1 : 0);
 }
 
-INSTANTIATE_TEST_CASE_P(DefaultHTTPCodecFactoryTest,
-                        DefaultHTTPCodecFactoryValidationTest,
-                        ::testing::Values(true, false));
+INSTANTIATE_TEST_SUITE_P(DefaultHTTPCodecFactoryTest,
+                         DefaultHTTPCodecFactoryValidationTest,
+                         ::testing::Values(true, false));
diff --git a/proxygen/lib/http/codec/test/FilterTests.cpp b/proxygen/lib/http/codec/test/FilterTests.cpp
@@ -26,8 +26,8 @@ const uint32_t kInitialCapacity = 12345;
 
 class MockFlowControlCallback : public FlowControlFilter::Callback {
  public:
-  MOCK_METHOD0(onConnectionSendWindowOpen, void());
-  MOCK_METHOD0(onConnectionSendWindowClosed, void());
+  MOCK_METHOD(void, onConnectionSendWindowOpen, ());
+  MOCK_METHOD(void, onConnectionSendWindowClosed, ());
 };
 
 class FilterTest : public testing::Test {

diff --git a/proxygen/lib/http/codec/test/HQCodecTest.cpp b/proxygen/lib/http/codec/test/HQCodecTest.cpp
@@ -948,7 +948,7 @@ TEST_P(HQCodecTestFrameAllowed, FrameAllowedOnCodec) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     FrameAllowedTests,
     HQCodecTestFrameAllowed,
     Values(
@@ -1056,7 +1056,7 @@ TEST_P(H1QCodecTestFrameAllowed, FrameAllowedOnH1qControlCodec) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     H1QFrameAllowedTests,
     H1QCodecTestFrameAllowed,
     Values(
@@ -1128,7 +1128,7 @@ TEST_P(HQCodecTestFrameBeforeSettings, FrameAllowedOnH1qControlCodec) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     FrameBeforeSettingsTests,
     HQCodecTestFrameBeforeSettings,
     Values(

diff --git a/proxygen/lib/http/codec/test/HQFramerTest.cpp b/proxygen/lib/http/codec/test/HQFramerTest.cpp
@@ -174,7 +174,7 @@ TEST_P(HQFramerTestDataOnlyFrames, TestDataOnlyFrame) {
   EXPECT_EQ(outBuf->moveToFbString(), data->moveToFbString());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     DataOnlyFrameWriteParseTests,
     HQFramerTestDataOnlyFrames,
     Values((DataOnlyFrameParams){proxygen::hq::FrameType::DATA,
@@ -278,7 +278,7 @@ TEST_P(HQFramerTestIdOnlyFrames, TestIdOnlyFrame) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     IdOnlyFrameWriteParseTests,
     HQFramerTestIdOnlyFrames,
     Values((IdOnlyFrameParams){proxygen::hq::FrameType::CANCEL_PUSH,
@@ -380,7 +380,7 @@ TEST_P(HQFramerTestSettingsValues, ValueAllowed) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     SettingsValuesAllowedTests,
     HQFramerTestSettingsValues,
     Values((SettingsValuesParams){hq::SettingId::MAX_HEADER_LIST_SIZE, 0, true},

diff --git a/proxygen/lib/http/codec/test/HTTP1xCodecTest.cpp b/proxygen/lib/http/codec/test/HTTP1xCodecTest.cpp
@@ -1476,7 +1476,7 @@ TEST_P(ConnectionHeaderTest, TestConnectionHeaders) {
   EXPECT_EQ(headers.getSingleOrEmpty(HTTP_HEADER_CONNECTION), val.second);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     HTTP1xCodec,
     ConnectionHeaderTest,
     ::testing::Values(
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,4 +150,4 @@ TEST_P(HPACKQueueTests, QueueDeleted) { @@
       }
     }
-    INSTANTIATE_TEST_CASE_P(Queue, HPACKQueueTests, ::testing::Values(0, 1, 2, 3));
+    INSTANTIATE_TEST_SUITE_P(Queue, HPACKQueueTests, ::testing::Values(0, 1, 2, 3));