Fix unittest build issue for glib 2.78.4

Change-Id: Iaff327679b771632cfa34ad531997c6a46701301
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>

diff --git a/tests/unit_tests/src/test_badge.cc b/tests/unit_tests/src/test_badge.cc
index 0a51a1e..df3f84e 100644 (file)
--- a/tests/unit_tests/src/test_badge.cc
+++ b/tests/unit_tests/src/test_badge.cc
@@ -677,11 +677,6 @@ TEST_F(BadgeTest, badge_create) {
 
 TEST_F(BadgeTest, badge_setting_positive) {
   badge_setting_h setting;
-  GVariant* reply_body = g_variant_new("(v)",
-      g_variant_new("(ssi)", pkgid2_, "appid", 1));
-  auto v_ptr =
-      std::unique_ptr<GVariant, decltype(g_object_unref)*>(
-        reply_body, g_object_unref);
 
   EXPECT_CALL(GetMock<SystemInfoMock>(),
       system_info_get_platform_bool(_, _)).
@@ -689,16 +684,37 @@ TEST_F(BadgeTest, badge_setting_positive) {
                             Return(0)));
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_message_new_method_call(_, _, _, _)).
-      WillRepeatedly(Return(msg_));
+      WillRepeatedly(
+        Invoke([&](const gchar* bus_name, const gchar* obj_path,
+          const gchar* interface_name, const gchar* method_name)
+          -> GDBusMessage* {
+        GDBusMessage* msg =
+            (GDBusMessage*)g_object_new(G_TYPE_OBJECT, nullptr);
+        return msg;
+      }));
 
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_connection_send_message_with_reply_sync(
         _, _, _, _, _, _, _)).
-      WillRepeatedly(Return(msg_));
+      WillRepeatedly(
+        Invoke([&](GDBusConnection* con, GDBusMessage* mesg,
+          GDBusSendMessageFlags flags, gint timeout, volatile guint32* out_serial,
+          GCancellable* cancelable, GError** error)
+          -> GDBusMessage* {
+        GDBusMessage* msg =
+            (GDBusMessage*)g_object_new(G_TYPE_OBJECT, nullptr);
+        return msg;
+      }));
 
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_message_get_body(_)).
-      WillRepeatedly(Return(reply_body));
+      WillRepeatedly(
+        Invoke([&](GDBusMessage* message)
+          -> GVariant* {
+          GVariant* reply = g_variant_new("(v)",
+          g_variant_new("(ssi)", pkgid2_, "appid", 1));
+        return reply;
+      }));
 
   EXPECT_CALL(GetMock<GioMock>(),
       g_dbus_message_to_gerror(_, _)).