Modify the droute tests to use the new introspection scheme.

diff --git a/droute/Makefile.am b/droute/Makefile.am
index 1c4b8e3..94cefaf 100644 (file)
--- a/droute/Makefile.am
+++ b/droute/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libdroute.la
 
 libdroute_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
-                      -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"\
                       -I$(top_builddir)\
                       -I$(top_srcdir)
 
@@ -20,8 +19,7 @@ check_PROGRAMS = droute-test
 droute_test_SOURCES  = droute-test.c
 droute_test_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                     -I$(top_builddir)\
-                    -I$(top_srcdir)\
-                    -DTEST_INTROSPECTION_DIRECTORY=\"$(top_srcdir)/droute\"
+                    -I$(top_srcdir)
 
 droute_test_LDFLAGS  = $(top_builddir)/dbind/libdbind.la\
                       libdroute.la\

diff --git a/droute/droute-test.c b/droute/droute-test.c
index 8b3fb7c..32d8521 100644 (file)
--- a/droute/droute-test.c
+++ b/droute/droute-test.c
@@ -13,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"
 
@@ -25,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;
@@ -221,16 +251,18 @@ 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);
 

diff --git a/droute/test.interface.One b/droute/test.interface.One
deleted file mode 100644 (file)
index a8e2206..0000000
--- a/droute/test.interface.One
+++ /dev/null
@@ -1,15 +0,0 @@
-<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>

diff --git a/droute/test.interface.Two b/droute/test.interface.Two
deleted file mode 100644 (file)
index ca661ec..0000000
--- a/droute/test.interface.Two
+++ /dev/null
@@ -1,15 +0,0 @@
-<interface name="test.interface.Two">
-  <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>