X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=droute%2Fdroute-test.c;h=33766a2cea92402aeb506d705703341814fd75fc;hb=5fea1914b655ca1b39a843b1f944422ba4d802e6;hp=1895fb66add8814a33a034165b8363502328944c;hpb=dfc071dcf2f98f282616911cb0eb1636c93f3e77;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/droute/droute-test.c b/droute/droute-test.c
index 1895fb6..33766a2 100644
--- a/droute/droute-test.c
+++ b/droute/droute-test.c
@@ -2,6 +2,7 @@
 #include <glib.h>
 #include <string.h>
 #include <droute/droute.h>
+#include <dbind/dbind.h>
 
 #include "dbus/dbus-glib-lowlevel.h"
 
@@ -12,10 +13,6 @@
 #define OBJECT_ONE "ObjectOne";
 #define OBJECT_TWO "ObjectTwo";
 
-#if !defined TEST_INTROSPECTION_DIRECTORY
-    #error "No introspection XML directory defined"
-#endif
-
 #define STRING_ONE "StringOne"
 #define STRING_TWO "StringTwo"
 
@@ -24,6 +21,40 @@
 
 #define NONE_REPLY_STRING "NoneMethod"
 
+const gchar *test_interface_One = \
+"<interface name=\"test.interface.One\">"
+"  <method name=\"null\"/>"
+"  <method name=\"getInt\">"
+"    <arg direction=\"out\" type=\"o\"/>"
+"  </method>"
+"  <method name=\"setInt\">"
+"    <arg direction=\"in\" type=\"o\"/>"
+"  </method>"
+"  <method name=\"getString\">"
+"    <arg direction=\"out\" type=\"s\"/>"
+"  </method>"
+"  <method name=\"setString\">"
+"    <arg direction=\"in\" type=\"s\"/>"
+"  </method>"
+"</interface>";
+
+const gchar *test_interface_Two = \
+"<interface name=\"test.interface.One\">"
+"  <method name=\"null\"/>"
+"  <method name=\"getInt\">"
+"    <arg direction=\"out\" type=\"o\"/>"
+"  </method>"
+"  <method name=\"setInt\">"
+"    <arg direction=\"in\" type=\"o\"/>"
+"  </method>"
+"  <method name=\"getString\">"
+"    <arg direction=\"out\" type=\"s\"/>"
+"  </method>"
+"  <method name=\"setString\">"
+"    <arg direction=\"in\" type=\"s\"/>"
+"  </method>"
+"</interface>";
+
 typedef struct _AnObject
 {
     gchar *astring;
@@ -37,9 +68,7 @@ static gboolean       success = TRUE;
 static DBusMessage *
 impl_null (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-    AnObject    *object = (AnObject *) user_data;
     DBusMessage *reply;
-    DBusError    error;
 
     reply = dbus_message_new_method_return (message);
     return reply;
@@ -107,7 +136,6 @@ impl_setString (DBusConnection *bus, DBusMessage *message, void *user_data)
 static DBusMessage *
 impl_getInterfaceOne (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-    AnObject    *object = (AnObject *) user_data;
     DBusMessage *reply;
     DBusError    error;
     gchar       *itf = TEST_INTERFACE_ONE;
@@ -122,7 +150,6 @@ impl_getInterfaceOne (DBusConnection *bus, DBusMessage *message, void *user_data
 static DBusMessage *
 impl_getInterfaceTwo (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-    AnObject    *object = (AnObject *) user_data;
     DBusMessage *reply;
     DBusError    error;
     gchar       *itf = TEST_INTERFACE_TWO;
@@ -161,8 +188,8 @@ static DRouteProperty test_properties[] = {
 gboolean
 do_tests_func (gpointer data)
 {
-    DBusError  error;
-    gchar     *bus_name;
+    DBusError    error;
+    const gchar *bus_name;
 
     gchar     *expected_string;
     gchar     *result_string;
@@ -224,21 +251,23 @@ int main (int argc, char **argv)
     bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
     dbus_connection_setup_with_g_main(bus, g_main_context_default());
 
-    cnx = droute_new (bus, TEST_INTROSPECTION_DIRECTORY);
+    cnx = droute_new (bus);
     path = droute_add_one (cnx, TEST_OBJECT_PATH, object);
 
     droute_path_add_interface (path,
                                TEST_INTERFACE_ONE,
+                               test_interface_One,
                                test_methods_one,
                                test_properties);
 
     droute_path_add_interface (path,
                                TEST_INTERFACE_TWO,
+                               test_interface_Two,
                                test_methods_two,
                                test_properties);
 
     g_idle_add (do_tests_func, NULL);
-    g_main_run(main_loop);
+    g_main_loop_run(main_loop);
     if (success)
             return 0;
     else