diff options
author | Inkyun Kil <inkyun.kil@samsung.com> | 2024-03-14 17:52:40 +0900 |
---|---|---|
committer | Inkyun Kil <inkyun.kil@samsung.com> | 2024-03-14 17:52:40 +0900 |
commit | 024e2837aff65d6a46b40a071e40c7f9f2b3de84 (patch) | |
tree | bdc514ac9078276c03becc294263f44a29e22879 | |
parent | 3fe15bab7bab43067dc9719e188dc00512e17792 (diff) | |
download | message-port-024e2837aff65d6a46b40a071e40c7f9f2b3de84.tar.gz message-port-024e2837aff65d6a46b40a071e40c7f9f2b3de84.tar.bz2 message-port-024e2837aff65d6a46b40a071e40c7f9f2b3de84.zip |
Fix unittest i586 build issue for glib 2.78.4
Change-Id: If6bb3b609081a14637bb00c7bb2d514fb40f6a3d
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
-rw-r--r-- | test/unit_tests/test_message_port.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/test/unit_tests/test_message_port.cc b/test/unit_tests/test_message_port.cc index 77eec35..d347fa5 100644 --- a/test/unit_tests/test_message_port.cc +++ b/test/unit_tests/test_message_port.cc @@ -257,6 +257,11 @@ guint __g_bus_watch_name_on_connection(GDBusConnection* connection, name_vanished_handler(nullptr, "test", (gpointer)id); return 10; } +GDBusMessage* g_dbus_message_new_method_call_fake(const gchar* arg0, + const gchar* arg1, const gchar* arg2, const gchar* arg3) { + GDBusMessage* message = (GDBusMessage*)g_object_new(G_TYPE_OBJECT, nullptr); + return message; +} TEST_F(MessagePortTest, message_port_register_local_port2) { GDBusNodeInfo* info = reinterpret_cast<GDBusNodeInfo*>( @@ -277,7 +282,7 @@ TEST_F(MessagePortTest, message_port_register_local_port2) { WillOnce(Invoke(__g_bus_watch_name_on_connection)); EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); EXPECT_CALL(GetMock<GioMock>(), g_dbus_connection_send_message_with_reply_sync(_, _, _, _, _, _, _)). WillOnce(Return(&__message)); @@ -317,7 +322,7 @@ TEST_F(MessagePortTest, message_port_register_local_port_n) { TEST_F(MessagePortTest, message_port_send_message) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_message("test", "PORT", message.GetHandle()); @@ -332,7 +337,7 @@ TEST_F(MessagePortTest, message_port_send_message_n) { TEST_F(MessagePortTest, message_port_send_message_with_local_port) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_message_with_local_port( @@ -360,17 +365,14 @@ TEST_F(MessagePortTest, message_port_send_message_with_local_port2) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_message_with_local_port( "remote_app", "PORT", message.GetHandle(), 1); - g_variant_unref(__call_sync_reply); - __call_sync_reply = nullptr; + __call_sync_reply = g_variant_new("(b)", true); ret = message_port_send_message_with_local_port( "remote_app", "PORT", message.GetHandle(), 1); - g_variant_unref(__call_sync_reply); - __call_sync_reply = nullptr; EXPECT_EQ(ret, MESSAGE_PORT_ERROR_NONE); __io_func(nullptr, G_IO_IN, __io_data); @@ -383,11 +385,10 @@ TEST_F(MessagePortTest, message_port_send_message_with_local_port3) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_message_with_local_port( "remote_app", "PORT", message.GetHandle(), 1); - g_variant_unref(__call_sync_reply); __call_sync_reply = nullptr; EXPECT_EQ(ret, MESSAGE_PORT_ERROR_NONE); __io_notify(__io_data); @@ -422,7 +423,7 @@ TEST_F(MessagePortTest, message_port_register_trusted_local_port_n) { TEST_F(MessagePortTest, message_port_send_trusted_message_with_local_port) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_trusted_message_with_local_port( @@ -446,7 +447,7 @@ TEST_F(MessagePortTest, message_port_send_trusted_message_with_local_port_n2) { TEST_F(MessagePortTest, message_port_send_trusted_message) { EXPECT_CALL(GetMock<GioMock>(), g_dbus_message_new_method_call(_, _, _, _)). - WillOnce(Return(&__message)); + WillOnce(Invoke(g_dbus_message_new_method_call_fake)); tizen_base::Bundle message; int ret = message_port_send_trusted_message( |