Use old gmock API

Some product uses old gmock API.

Change-Id: I06b43a1a597460a78b481fb68ecd599bb58ceb95
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/mock/aul_mock.h b/mock/aul_mock.h
index b4e3a9fd9f0f0fb6563d38831d2cfaffb1215be5..ce34f545469f24a872251c2b06bbebe63e3a8447 100644 (file)
--- a/mock/aul_mock.h
+++ b/mock/aul_mock.h
@@ -40,8 +40,8 @@ class AulMock : public virtual ModuleMock {
 
   virtual ~AulMock() {}
 
-  MOCK_METHOD(int, aul_app_get_appid_bypid, (int, char*, int));
-  MOCK_METHOD(int, aul_app_get_pkgid_bypid_for_uid, (int, char*, int, uid_t));
+  MOCK_METHOD3(aul_app_get_appid_bypid, int (int, char*, int));
+  MOCK_METHOD4(aul_app_get_pkgid_bypid_for_uid, int (int, char*, int, uid_t));
 };
 
 #endif  // UNIT_TESTS_MOCK_AUL_MOCK_H_

diff --git a/mock/dbus_mock.h b/mock/dbus_mock.h
index aaa1d94cd56570520cdbcdd06ad42a2683e8cac9..0e01c5b1958b531548eab189c86720a7ec80a4aa 100644 (file)
--- a/mock/dbus_mock.h
+++ b/mock/dbus_mock.h
@@ -37,40 +37,37 @@ class DbusMock : public virtual ModuleMock {
         .WillByDefault(Return(conn));
   }
 
-  MOCK_METHOD(GDBusConnection*, g_bus_get_sync, (GBusType, GCancellable*,
+  MOCK_METHOD3(g_bus_get_sync, GDBusConnection* (GBusType, GCancellable*,
       GError**));
-  MOCK_METHOD(GDBusProxy*, g_dbus_proxy_new_sync,
-      (GDBusConnection*, GDBusProxyFlags, GDBusInterfaceInfo*,
-      const gchar*, const gchar*, const gchar*, GCancellable*, GError**));
-  MOCK_METHOD(GDBusNodeInfo*, g_dbus_node_info_new_for_xml,
-      (const gchar*, GError**));
-  MOCK_METHOD(guint, g_bus_own_name_on_connection, (GDBusConnection*,
-      const gchar*, GBusNameOwnerFlags,GBusNameAcquiredCallback,
+  MOCK_METHOD8(g_dbus_proxy_new_sync, GDBusProxy* (GDBusConnection*,
+      GDBusProxyFlags, GDBusInterfaceInfo*, const gchar*, const gchar*,
+      const gchar*, GCancellable*, GError**));
+  MOCK_METHOD2(g_dbus_node_info_new_for_xml, GDBusNodeInfo* (const gchar*,
+      GError**));
+  MOCK_METHOD7(g_bus_own_name_on_connection, guint (GDBusConnection*,
+      const gchar*, GBusNameOwnerFlags, GBusNameAcquiredCallback,
       GBusNameLostCallback, gpointer, GDestroyNotify));
-  MOCK_METHOD(guint, g_dbus_connection_register_object,
-      (GDBusConnection*, const gchar*, GDBusInterfaceInfo*,
-      const GDBusInterfaceVTable*, gpointer, GDestroyNotify, GError**));
-  MOCK_METHOD(gboolean, g_dbus_connection_unregister_object,
-      (GDBusConnection*, guint));
-  MOCK_METHOD(void, g_dbus_method_invocation_return_value,
-      (GDBusMethodInvocation*, GVariant*));
-  MOCK_METHOD(void, g_bus_unown_name, (guint));
-  MOCK_METHOD(gboolean, g_dbus_connection_emit_signal,
-      (GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*,
-      GVariant*, GError**));
-  MOCK_METHOD(gboolean, g_dbus_connection_flush_sync,
-      (GDBusConnection*, GCancellable*, GError**));
-  MOCK_METHOD(void, g_dbus_node_info_unref, (GDBusNodeInfo*));
-  MOCK_METHOD(guint, g_dbus_connection_signal_subscribe,
-      (GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*,
-      const gchar*, GDBusSignalFlags, GDBusSignalCallback, gpointer,
-      GDestroyNotify));
-  MOCK_METHOD(GVariant*, g_dbus_proxy_call_sync,
-      (GDBusProxy*, const gchar*, GVariant*, GDBusCallFlags, gint,
+  MOCK_METHOD7(g_dbus_connection_register_object, guint (GDBusConnection*,
+      const gchar*, GDBusInterfaceInfo*, const GDBusInterfaceVTable*, gpointer,
+      GDestroyNotify, GError**));
+  MOCK_METHOD2(g_dbus_connection_unregister_object, gboolean (GDBusConnection*,
+      guint));
+  MOCK_METHOD2(g_dbus_method_invocation_return_value,
+      void (GDBusMethodInvocation*, GVariant*));
+  MOCK_METHOD1(g_bus_unown_name, void (guint));
+  MOCK_METHOD7(g_dbus_connection_emit_signal, gboolean (GDBusConnection*,
+      const gchar*, const gchar*, const gchar*, const gchar*, GVariant*,
+      GError**));
+  MOCK_METHOD3(g_dbus_connection_flush_sync, gboolean (GDBusConnection*,
       GCancellable*, GError**));
-  MOCK_METHOD(void, g_dbus_proxy_call,
-      (GDBusProxy*, const gchar*, GVariant*, GDBusCallFlags, gint,
-      GCancellable*, GAsyncReadyCallback, gpointer));
+  MOCK_METHOD1(g_dbus_node_info_unref, void (GDBusNodeInfo*));
+  MOCK_METHOD10(g_dbus_connection_signal_subscribe, guint (GDBusConnection*,
+      const gchar*, const gchar*, const gchar*, const gchar*, const gchar*,
+      GDBusSignalFlags, GDBusSignalCallback, gpointer, GDestroyNotify));
+  MOCK_METHOD7(g_dbus_proxy_call_sync, GVariant* (GDBusProxy*, const gchar*,
+      GVariant*, GDBusCallFlags, gint, GCancellable*, GError**));
+  MOCK_METHOD8(g_dbus_proxy_call, void (GDBusProxy*, const gchar*, GVariant*,
+      GDBusCallFlags, gint, GCancellable*, GAsyncReadyCallback, gpointer));
 };
 
 #endif  // UNIT_TESTS_MOCK_DBUS_MOCK_H_

diff --git a/mock/glib_mock.h b/mock/glib_mock.h
index 1b477d2663a52a8453c1b85d9313e29f94cf413c..6aed6369ad01383d9b91554fd81f66f0014ecd2e 100644 (file)
--- a/mock/glib_mock.h
+++ b/mock/glib_mock.h
@@ -31,7 +31,7 @@ class GlibMock : public virtual ModuleMock {
     using ::testing::Invoke;
   }
 
-  MOCK_METHOD(gsize, g_variant_get_size, (GVariant*));
+  MOCK_METHOD1(g_variant_get_size, gsize (GVariant*));
 };
 
 #endif  // UNIT_TESTS_MOCK_GLIB_MOCK_H_

diff --git a/mock/notification_mock.h b/mock/notification_mock.h
index 3db47362d58bca2f07cb611112f62045aa93104a..f6358d62882e23f5d5183c86016898619316505d 100644 (file)
--- a/mock/notification_mock.h
+++ b/mock/notification_mock.h
@@ -32,8 +32,8 @@ class NotificationMock : public virtual ModuleMock {
     using ::testing::Invoke;
   }
 
-  MOCK_METHOD(GVariant*, notification_ipc_make_gvariant_from_noti,
-      (notification_h, bool));
+  MOCK_METHOD2(notification_ipc_make_gvariant_from_noti,
+      GVariant* (notification_h, bool));
 };
 
 #endif  // UNIT_TESTS_MOCK_NOTIFICATION_MOCK_H_

diff --git a/mock/pkgmgr_info_mock.h b/mock/pkgmgr_info_mock.h
index 8a87f4cfa8aa4433a16f2baf503afb9cd22176d9..9350fa2702a5c1443efb2e0f0326895eff1c1af5 100644 (file)
--- a/mock/pkgmgr_info_mock.h
+++ b/mock/pkgmgr_info_mock.h
@@ -32,22 +32,22 @@ class PkgmgrInfoMock : public virtual ModuleMock {
 
   virtual ~PkgmgrInfoMock() {}
 
-  MOCK_METHOD(int, pkgmgrinfo_pkginfo_get_usr_pkginfo, (const char *,
-    uid_t, pkgmgrinfo_pkginfo_h*));
-  MOCK_METHOD(int, pkgmgrinfo_pkginfo_get_api_version,
-      (pkgmgrinfo_pkginfo_h, char **));
-  MOCK_METHOD(int, pkgmgrinfo_pkginfo_is_global,
-      (pkgmgrinfo_pkginfo_h, bool *));
-  MOCK_METHOD(int, pkgmgrinfo_pkginfo_destroy_pkginfo,
-      (pkgmgrinfo_pkginfo_h));
-  MOCK_METHOD(int, pkgmgrinfo_appinfo_get_usr_appinfo, (const char *,
-      uid_t, pkgmgrinfo_appinfo_h*));
-  MOCK_METHOD(int, pkgmgrinfo_appinfo_get_pkgid, (pkgmgrinfo_pkginfo_h,
-      char **));
-  MOCK_METHOD(int, pkgmgrinfo_appinfo_get_component_type,
-      (pkgmgrinfo_appinfo_h, char **));
-  MOCK_METHOD(int, pkgmgrinfo_appinfo_destroy_appinfo,
-      (pkgmgrinfo_appinfo_h));
+  MOCK_METHOD3(pkgmgrinfo_pkginfo_get_usr_pkginfo,
+      int (const char *, uid_t, pkgmgrinfo_pkginfo_h*));
+  MOCK_METHOD2(pkgmgrinfo_pkginfo_get_api_version,
+      int (pkgmgrinfo_pkginfo_h, char **));
+  MOCK_METHOD2(pkgmgrinfo_pkginfo_is_global,
+      int (pkgmgrinfo_pkginfo_h, bool *));
+  MOCK_METHOD1(pkgmgrinfo_pkginfo_destroy_pkginfo,
+      int (pkgmgrinfo_pkginfo_h));
+  MOCK_METHOD3(pkgmgrinfo_appinfo_get_usr_appinfo,
+      int (const char *, uid_t, pkgmgrinfo_appinfo_h*));
+  MOCK_METHOD2(pkgmgrinfo_appinfo_get_pkgid,
+      int (pkgmgrinfo_pkginfo_h, char **));
+  MOCK_METHOD2(pkgmgrinfo_appinfo_get_component_type,
+      int (pkgmgrinfo_appinfo_h, char **));
+  MOCK_METHOD1(pkgmgrinfo_appinfo_destroy_appinfo,
+      int (pkgmgrinfo_appinfo_h));
 };
 
 #endif  // UNIT_TESTS_MOCK_PKGMGR_INFO_MOCK_H_