Revert "Replace mock API"

This reverts commit d3a2fe0da5ace379466c837f656c2e4357207aa9.

Change-Id: Ib823cecb94ecd44321ded6215ad9c0d7ae1f58d7

diff --git a/test/unit_tests/mock/dbus_mock.h b/test/unit_tests/mock/dbus_mock.h
index 31f6148..a0288d1 100644 (file)
--- a/test/unit_tests/mock/dbus_mock.h
+++ b/test/unit_tests/mock/dbus_mock.h
@@ -46,20 +46,20 @@ class DbusMock : public virtual ModuleMock {
         .WillByDefault(Return(reply));
   }
 
-  MOCK_METHOD(GDBusConnection*, g_bus_get_sync, (GBusType, GCancellable*,
+  MOCK_METHOD3(g_bus_get_sync, GDBusConnection* (GBusType, GCancellable*,
       GError**));
-  MOCK_METHOD(guint, g_dbus_connection_signal_subscribe,
-      (GDBusConnection*, const gchar*, const gchar*, const gchar*,
+  MOCK_METHOD10(g_dbus_connection_signal_subscribe,
+      guint (GDBusConnection*, const gchar*, const gchar*, const gchar*,
       const gchar*, const gchar*, GDBusSignalFlags, GDBusSignalCallback,
       gpointer, GDestroyNotify));
-  MOCK_METHOD(void, g_object_unref, (gpointer));
-  MOCK_METHOD(GDBusMessage*, g_dbus_message_new_method_call,
-      (const gchar*, const gchar*, const gchar*, const gchar*));
-  MOCK_METHOD(void, g_dbus_message_set_body, (GDBusMessage*, GVariant*));
-  MOCK_METHOD(GVariant*, g_dbus_message_get_body, (GDBusMessage*));
-  MOCK_METHOD(GDBusMessage*, g_dbus_connection_send_message_with_reply_sync,
-      (GDBusConnection*, GDBusMessage*, GDBusSendMessageFlags,
-      gint, volatile guint32*, GCancellable*, GError**));
+  MOCK_METHOD1(g_object_unref, void (gpointer));
+  MOCK_METHOD4(g_dbus_message_new_method_call,
+      GDBusMessage* (const gchar*, const gchar*, const gchar*, const gchar*));
+  MOCK_METHOD2(g_dbus_message_set_body, void (GDBusMessage*, GVariant*));
+  MOCK_METHOD1(g_dbus_message_get_body, GVariant* (GDBusMessage*));
+  MOCK_METHOD7(g_dbus_connection_send_message_with_reply_sync,
+      GDBusMessage* (GDBusConnection*, GDBusMessage*, GDBusSendMessageFlags,
+          gint, volatile guint32*, GCancellable*, GError**));
 };
 
 #endif  // UNIT_TESTS_MOCK_DBUS_MOCK_H_

diff --git a/test/unit_tests/mock/glib_mock.h b/test/unit_tests/mock/glib_mock.h
index 6cdfd22..8012e5f 100644 (file)
--- a/test/unit_tests/mock/glib_mock.h
+++ b/test/unit_tests/mock/glib_mock.h
@@ -31,7 +31,7 @@ class GlibMock : public virtual ModuleMock {
     using ::testing::Invoke;
   }
 
-  MOCK_METHOD(GIOChannel*, g_io_channel_unix_new, (gint));
+  MOCK_METHOD1(g_io_channel_unix_new, GIOChannel* (gint));
 };
 
 #endif  // UNIT_TESTS_MOCK_GLIB_MOCK_H_

diff --git a/test/unit_tests/mock/os_mock.h b/test/unit_tests/mock/os_mock.h
index 39f04bc..1e46950 100644 (file)
--- a/test/unit_tests/mock/os_mock.h
+++ b/test/unit_tests/mock/os_mock.h
@@ -32,7 +32,7 @@ class OsMock : public virtual ModuleMock {
     using ::testing::Invoke;
   }
 
-  MOCK_METHOD(int, mkdir, (const char* path, mode_t));
+  MOCK_METHOD2(mkdir, int (const char* path, mode_t));
 };
 
 #endif  // TEST_UNIT_TESTS_MOCK_OS_MOCK_H_

diff --git a/test/unit_tests/mock/socket_mock.h b/test/unit_tests/mock/socket_mock.h
index 3c61c52..cb7ab40 100644 (file)
--- a/test/unit_tests/mock/socket_mock.h
+++ b/test/unit_tests/mock/socket_mock.h
@@ -42,12 +42,12 @@ class SocketMock : public virtual ModuleMock {
         .WillByDefault(Return(kFakeFd));
   }
 
-  MOCK_METHOD(ssize_t, recv, (int, void*, size_t, int));
-  MOCK_METHOD(ssize_t, send, (int, const void*, size_t, int));
-  MOCK_METHOD(int, socket, (int, int, int));
-  MOCK_METHOD(int, connect, (int, const struct sockaddr*, socklen_t));
-  MOCK_METHOD(int, listen, (int, int));
-  MOCK_METHOD(int, bind, (int, const struct sockaddr*, socklen_t));
+  MOCK_METHOD4(recv, ssize_t (int, void*, size_t, int));
+  MOCK_METHOD4(send, ssize_t (int, const void*, size_t, int));
+  MOCK_METHOD3(socket, int (int, int, int));
+  MOCK_METHOD3(connect, int (int, const struct sockaddr*, socklen_t));
+  MOCK_METHOD2(listen, int (int, int));
+  MOCK_METHOD3(bind, int (int, const struct sockaddr*, socklen_t));
 };
 
 #endif  // TEST_UNIT_TESTS_MOCK_SOCKET_MOCK_H_