Revert D34351084: Migrate from googletest 1.8 to googletest 1.10

Differential Revision: D34351084 (d9411ba) Original commit changeset: 939b3985ab63 Original Phabricator Diff: D34351084 (d9411ba) fbshipit-source-id: 2fd17e0ccd9d1f1d643f4a372d84cb95f5add1f8
facebookincubator · Mar 3, 2022 · 2a1cef7 · 2a1cef7
1 parent d9411ba
commit 2a1cef7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 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
+googletest_1_8
 
 [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
+googletest_1_8
 
 [shipit.pathmap]
 fbcode/proxygen/public_tld = .

diff --git a/server/test/HaskellProcessorTest.cpp b/server/test/HaskellProcessorTest.cpp
@@ -31,19 +31,18 @@ struct MockResponseChannelRequest : public ResponseChannelRequest {
     return true;
   }
 
-  MOCK_METHOD(
-      void,
+  MOCK_METHOD3(
       sendReply,
-      (ResponsePayload&&,
-       MessageChannel::SendCallback*,
-       folly::Optional<uint32_t>));
+      void(
+          ResponsePayload&&,
+          MessageChannel::SendCallback*,
+          folly::Optional<uint32_t>));
 
-  MOCK_METHOD(
-      void,
+  MOCK_METHOD2(
       sendException,
-      (ResponsePayload&&, MessageChannel::SendCallback*));
+      void(ResponsePayload&&, MessageChannel::SendCallback*));
 
-  MOCK_METHOD(void, sendErrorWrapped, (folly::exception_wrapper, std::string));
+  MOCK_METHOD2(sendErrorWrapped, void(folly::exception_wrapper, std::string));
 
   bool active;
   size_t& destroyed;