From: Christopher Dykes <cdykes@fb.com>
Date: Sat, 10 Sep 2016 00:44:00 +0000 (-0700)
Subject: Use the GMock portability header
X-Git-Tag: v2016.09.12.00~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=90989a73a5316c6c436456d1defff36a7e3680f3;p=folly.git

Use the GMock portability header

Summary:
Switch all of the uses of <gmock/gmock.h> to <folly/portability/GMock.h>.

This is painful but necessary to get the tests to compile nicely under MSVC.

Reviewed By: yfeldblum

Differential Revision: D3837529

fbshipit-source-id: 7221dfea8f2a880919690b5b0601ca91642991ae
---

diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp
index 1622dcab..e5dbed11 100644
--- a/folly/io/async/test/AsyncSSLSocketTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest.cpp
@@ -21,6 +21,7 @@
 #include <folly/SocketAddress.h>
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/GMock.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 
@@ -37,8 +38,6 @@
 #include <set>
 #include <thread>
 
-#include <gmock/gmock.h>
-
 using std::string;
 using std::vector;
 using std::min;
diff --git a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
index 468cf093..13270a69 100644
--- a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
@@ -18,9 +18,9 @@
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/GMock.h>
 
 #include <gtest/gtest.h>
-#include <gmock/gmock.h>
 #include <string>
 #include <vector>
 
diff --git a/folly/io/async/test/AsyncSocketTest2.cpp b/folly/io/async/test/AsyncSocketTest2.cpp
index 4fa0a02e..bc27b241 100644
--- a/folly/io/async/test/AsyncSocketTest2.cpp
+++ b/folly/io/async/test/AsyncSocketTest2.cpp
@@ -25,13 +25,13 @@
 #include <folly/io/IOBuf.h>
 #include <folly/io/async/test/AsyncSocketTest.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/GMock.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
 #include <folly/test/SocketAddressTestHelper.h>
 
 #include <boost/scoped_array.hpp>
 #include <fcntl.h>
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <sys/types.h>
 #include <iostream>
diff --git a/folly/io/async/test/EventHandlerTest.cpp b/folly/io/async/test/EventHandlerTest.cpp
index 9b89724e..255f2140 100644
--- a/folly/io/async/test/EventHandlerTest.cpp
+++ b/folly/io/async/test/EventHandlerTest.cpp
@@ -22,8 +22,8 @@
 #include <folly/ScopeGuard.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventHandler.h>
+#include <folly/portability/GMock.h>
 #include <folly/portability/Sockets.h>
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <sys/eventfd.h>
 
diff --git a/folly/io/async/test/MockAsyncSSLSocket.h b/folly/io/async/test/MockAsyncSSLSocket.h
index decf4b81..699fa42f 100644
--- a/folly/io/async/test/MockAsyncSSLSocket.h
+++ b/folly/io/async/test/MockAsyncSSLSocket.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 #pragma once
-#include <gmock/gmock.h>
 
 #include <folly/io/async/AsyncSSLSocket.h>
+#include <folly/portability/GMock.h>
 
 namespace folly { namespace test {
 
diff --git a/folly/io/async/test/MockAsyncServerSocket.h b/folly/io/async/test/MockAsyncServerSocket.h
index c0956c09..29156ad1 100644
--- a/folly/io/async/test/MockAsyncServerSocket.h
+++ b/folly/io/async/test/MockAsyncServerSocket.h
@@ -15,10 +15,9 @@
  */
 #pragma once
 
-#include <gmock/gmock.h>
-
 #include <folly/io/async/AsyncServerSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/GMock.h>
 
 namespace folly {
 
diff --git a/folly/io/async/test/MockAsyncSocket.h b/folly/io/async/test/MockAsyncSocket.h
index 32c692ad..d8f58409 100644
--- a/folly/io/async/test/MockAsyncSocket.h
+++ b/folly/io/async/test/MockAsyncSocket.h
@@ -15,10 +15,9 @@
  */
 #pragma once
 
-#include <gmock/gmock.h>
-
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/GMock.h>
 
 namespace folly {
 
diff --git a/folly/io/async/test/MockAsyncTransport.h b/folly/io/async/test/MockAsyncTransport.h
index 9703f34f..80f5022b 100644
--- a/folly/io/async/test/MockAsyncTransport.h
+++ b/folly/io/async/test/MockAsyncTransport.h
@@ -15,10 +15,9 @@
  */
 #pragma once
 
-#include <gmock/gmock.h>
-
 #include <folly/Memory.h>
 #include <folly/io/async/AsyncTransport.h>
+#include <folly/portability/GMock.h>
 
 namespace folly { namespace test {
 
diff --git a/folly/io/async/test/MockAsyncUDPSocket.h b/folly/io/async/test/MockAsyncUDPSocket.h
index 267b2113..8a9c204d 100644
--- a/folly/io/async/test/MockAsyncUDPSocket.h
+++ b/folly/io/async/test/MockAsyncUDPSocket.h
@@ -15,9 +15,8 @@
  */
 #pragma once
 
-#include <gmock/gmock.h>
-
 #include <folly/io/async/AsyncUDPSocket.h>
+#include <folly/portability/GMock.h>
 
 namespace folly { namespace test {
 
diff --git a/folly/io/async/test/MockTimeoutManager.h b/folly/io/async/test/MockTimeoutManager.h
index 686aa3f7..2c27c664 100644
--- a/folly/io/async/test/MockTimeoutManager.h
+++ b/folly/io/async/test/MockTimeoutManager.h
@@ -16,8 +16,9 @@
 #pragma once
 
 #include <folly/io/async/TimeoutManager.h>
+#include <folly/portability/GMock.h>
+
 #include <chrono>
-#include <gmock/gmock.h>
 
 namespace folly {
 namespace test {
diff --git a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
index 6f8bbc7b..0baac518 100644
--- a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
+++ b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 #include <gtest/gtest.h>
-#include <gmock/gmock.h>
 
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/WriteChainAsyncTransportWrapper.h>
+#include <folly/portability/GMock.h>
 
 using namespace testing;
 using testing::_;
diff --git a/folly/test/MemoryIdlerTest.cpp b/folly/test/MemoryIdlerTest.cpp
index bcf3fd6c..d1536d0b 100644
--- a/folly/test/MemoryIdlerTest.cpp
+++ b/folly/test/MemoryIdlerTest.cpp
@@ -17,6 +17,7 @@
 #include <folly/detail/MemoryIdler.h>
 
 #include <folly/Baton.h>
+#include <folly/portability/GMock.h>
 #include <folly/portability/Windows.h>
 
 #include <memory>
@@ -24,7 +25,6 @@
 #include <assert.h>
 #include <semaphore.h>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 using namespace folly;
diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index 42d5bf7d..627c9547 100644
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -20,10 +20,10 @@
 #include <folly/Subprocess.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/portability/GMock.h>
 #include <folly/test/SingletonTestStructs.h>
 
 #include <glog/logging.h>
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <boost/thread/barrier.hpp>