From 95c8a7d28c2d2443389a3bcbffeae36966a7dc47 Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Wed, 9 May 2018 10:19:49 -0300 Subject: [PATCH] efl_mono: Fix eldbus warnings and typo. Summary: Depends on D6172 Reviewers: felipealmeida Reviewed By: felipealmeida Subscribers: cedric, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6173 --- .../mono/eldbus_mono/eldbus_connection.cs | 2 +- src/tests/efl_mono/Eldbus.cs | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/bindings/mono/eldbus_mono/eldbus_connection.cs b/src/bindings/mono/eldbus_mono/eldbus_connection.cs index f80a0aba0a..0da670efc1 100644 --- a/src/bindings/mono/eldbus_mono/eldbus_connection.cs +++ b/src/bindings/mono/eldbus_mono/eldbus_connection.cs @@ -313,7 +313,7 @@ public class Connection : IDisposable return new eldbus.Pending(pending_hdl, false); } - public eldbus.Pending ActivableList(eldbus.MessageDelegate dlgt = null) + public eldbus.Pending ActivatableList(eldbus.MessageDelegate dlgt = null) { CheckHandle(); diff --git a/src/tests/efl_mono/Eldbus.cs b/src/tests/efl_mono/Eldbus.cs index 9c9fe35e88..820c8984ef 100644 --- a/src/tests/efl_mono/Eldbus.cs +++ b/src/tests/efl_mono/Eldbus.cs @@ -158,6 +158,8 @@ class TestEldbusObject eldbus.Pending pending = obj.Send(message, objectMessageCb, -1); + AssertEquals(pending.GetMethod(), methodName); + timeout = ecore_timer_add(2.0, GetEcoreLoopClose(), IntPtr.Zero); Assert(timeout != IntPtr.Zero); @@ -216,6 +218,8 @@ class TestEldbusObject eldbus.Pending pending = obj.Introspect(objectMessageCb); + AssertEquals(pending.GetMethod(), "Introspect"); + timeout = ecore_timer_add(2.0, GetEcoreLoopClose(), IntPtr.Zero); Assert(timeout != IntPtr.Zero); @@ -236,13 +240,15 @@ class TestEldbusMessage private static bool isSuccess = false; - private static void ActivableList(eldbus.MessageDelegate messageCb) + private static void ActivatableList(eldbus.MessageDelegate messageCb) { isSuccess = false; var conn = new eldbus.Connection(eldbus.Connection.Type.System); - eldbus.Pending pending = conn.ActivableList(messageCb); + eldbus.Pending pending = conn.ActivatableList(messageCb); + + AssertEquals(pending.GetMethod(), "ListActivatableNames"); timeout = ecore_timer_add(2.0, GetEcoreLoopClose(), IntPtr.Zero); Assert(timeout != IntPtr.Zero); @@ -303,7 +309,7 @@ class TestEldbusMessage } }; - ActivableList(responseMessageCb); + ActivatableList(responseMessageCb); } public static void utc_eldbus_message_info_data_get_p() @@ -360,6 +366,8 @@ class TestEldbusMessage const int timeoutSendMs = 1000; eldbus.Pending pending = conn.Send(msg, messageMethodCb, timeoutSendMs); + AssertEquals(pending.GetMethod(), methodName); + timeout = ecore_timer_add(2.0, GetEcoreLoopClose(), IntPtr.Zero); Assert(timeout != IntPtr.Zero); @@ -438,7 +446,7 @@ class TestEldbusMessage ecore_main_loop_quit(); } }; - ActivableList(activatableListResponseCb); + ActivatableList(activatableListResponseCb); } }