commit f450486f238d6402b3ff9680ff50d2987b4f2d3d
author Willy Tu <wltu@google.com> Sat Apr 24 23:22:19 2021 -0700
committer Willy Tu <wltu@google.com> Sun Apr 25 17:11:21 2021 -0700
tree 75217141773c05ac219d257cd9550abf3eb68d1f
parent a3f65698000d366b57d2916eae67518f89c1298b

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

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

tools/test/internal_sys_mock.hpp

diff --git a/tools/test/internal_sys_mock.hpp b/tools/test/internal_sys_mock.hpp
index 97f95bf..fcd68bb 100644
--- a/tools/test/internal_sys_mock.hpp
+++ b/tools/test/internal_sys_mock.hpp
@@ -16,24 +16,29 @@
   public:
     virtual ~InternalSysMock() = default;
 
-    MOCK_CONST_METHOD2(open, int(const char*, int));
-    MOCK_CONST_METHOD3(read, int(int, void*, std::size_t));
-    MOCK_CONST_METHOD4(pread, int(int, void*, std::size_t, off_t));
-    MOCK_CONST_METHOD4(pwrite, int(int, const void*, std::size_t, off_t));
-    MOCK_CONST_METHOD1(close, int(int));
-    MOCK_CONST_METHOD6(mmap, void*(void*, std::size_t, int, int, int, off_t));
-    MOCK_CONST_METHOD2(munmap, int(void*, std::size_t));
-    MOCK_CONST_METHOD0(getpagesize, int());
-    MOCK_CONST_METHOD3(ioctl, int(int, unsigned long, void*));
-    MOCK_CONST_METHOD3(poll, int(struct pollfd*, nfds_t, int));
-    MOCK_CONST_METHOD3(socket, int(int, int, int));
-    MOCK_CONST_METHOD3(connect, int(int, const struct sockaddr*, socklen_t));
-    MOCK_CONST_METHOD4(sendfile, ssize_t(int, int, off_t*, size_t));
-    MOCK_CONST_METHOD4(getaddrinfo,
-                       int(const char*, const char*, const struct addrinfo*,
-                           struct addrinfo**));
-    MOCK_CONST_METHOD1(freeaddrinfo, void(struct addrinfo*));
-    MOCK_CONST_METHOD1(getSize, std::int64_t(const char*));
+    MOCK_METHOD(int, open, (const char*, int), (const override));
+    MOCK_METHOD(int, read, (int, void*, std::size_t), (const override));
+    MOCK_METHOD(int, pread, (int, void*, std::size_t, off_t), (const override));
+    MOCK_METHOD(int, pwrite, (int, const void*, std::size_t, off_t),
+                (const override));
+    MOCK_METHOD(int, close, (int), (const override));
+    MOCK_METHOD(void*, mmap, (void*, std::size_t, int, int, int, off_t),
+                (const override));
+    MOCK_METHOD(int, munmap, (void*, std::size_t), (const override));
+    MOCK_METHOD(int, getpagesize, (), (const override));
+    MOCK_METHOD(int, ioctl, (int, unsigned long, void*), (const override));
+    MOCK_METHOD(int, poll, (struct pollfd*, nfds_t, int), (const override));
+    MOCK_METHOD(int, socket, (int, int, int), (const override));
+    MOCK_METHOD(int, connect, (int, const struct sockaddr*, socklen_t),
+                (const override));
+    MOCK_METHOD(ssize_t, sendfile, (int, int, off_t*, size_t),
+                (const override));
+    MOCK_METHOD(int, getaddrinfo,
+                (const char*, const char*, const struct addrinfo*,
+                 struct addrinfo**),
+                (const override));
+    MOCK_METHOD(void, freeaddrinfo, (struct addrinfo*), (const override));
+    MOCK_METHOD(std::int64_t, getSize, (const char*), (const override));
 };
 
 } // namespace internal