commit 52b75fb3927d46b75e75fd6040577c914476e6f1
author Willy Tu <wltu@google.com> Sat Apr 24 11:18:36 2021 -0700
committer Willy Tu <wltu@google.com> Sat Apr 24 15:22:05 2021 -0700
tree 3819181e2385435bf0ee00f4180d09f42865b5a1
parent a533a3756f084ab6c5a80375074178440ba7c905

test: Replace the C++ MOCK_METHOD<n> macros with the new MOCK_METHOD

Change-Id: I1667c6edd37447dbb6e868e853eb5ac05f348f89
Signed-off-by: Willy Tu <wltu@google.com>

test/blob_mock.hpp

diff --git a/test/blob_mock.hpp b/test/blob_mock.hpp
index 7ec7d15..06b0c5a 100644
--- a/test/blob_mock.hpp
+++ b/test/blob_mock.hpp
@@ -12,18 +12,22 @@
   public:
     virtual ~BlobMock() = default;
 
-    MOCK_METHOD1(canHandleBlob, bool(const std::string&));
-    MOCK_METHOD0(getBlobIds, std::vector<std::string>());
-    MOCK_METHOD1(deleteBlob, bool(const std::string&));
-    MOCK_METHOD2(stat, bool(const std::string&, BlobMeta*));
-    MOCK_METHOD3(open, bool(uint16_t, uint16_t, const std::string&));
-    MOCK_METHOD3(read, std::vector<uint8_t>(uint16_t, uint32_t, uint32_t));
-    MOCK_METHOD3(write, bool(uint16_t, uint32_t, const std::vector<uint8_t>&));
-    MOCK_METHOD3(writeMeta,
-                 bool(uint16_t, uint32_t, const std::vector<uint8_t>&));
-    MOCK_METHOD2(commit, bool(uint16_t, const std::vector<uint8_t>&));
-    MOCK_METHOD1(close, bool(uint16_t));
-    MOCK_METHOD2(stat, bool(uint16_t, BlobMeta*));
-    MOCK_METHOD1(expire, bool(uint16_t));
+    MOCK_METHOD(bool, canHandleBlob, (const std::string&), (override));
+    MOCK_METHOD(std::vector<std::string>, getBlobIds, (), (override));
+    MOCK_METHOD(bool, deleteBlob, (const std::string&), (override));
+    MOCK_METHOD(bool, stat, (const std::string&, BlobMeta*), (override));
+    MOCK_METHOD(bool, open, (uint16_t, uint16_t, const std::string&),
+                (override));
+    MOCK_METHOD(std::vector<uint8_t>, read, (uint16_t, uint32_t, uint32_t),
+                (override));
+    MOCK_METHOD(bool, write, (uint16_t, uint32_t, const std::vector<uint8_t>&),
+                (override));
+    MOCK_METHOD(bool, writeMeta,
+                (uint16_t, uint32_t, const std::vector<uint8_t>&), (override));
+    MOCK_METHOD(bool, commit, (uint16_t, const std::vector<uint8_t>&),
+                (override));
+    MOCK_METHOD(bool, close, (uint16_t), (override));
+    MOCK_METHOD(bool, stat, (uint16_t, BlobMeta*), (override));
+    MOCK_METHOD(bool, expire, (uint16_t), (override));
 };
 } // namespace blobs