#include <glib.h>
#include <string.h>
#include <droute/droute.h>
+#include <dbind/dbind.h>
-#include "dbus/dbus-glib-lowlevel.h"
+#include "atspi/atspi.h"
#define TEST_OBJECT_PATH "/test/object"
#define TEST_INTERFACE_ONE "test.interface.One"
#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"
#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;
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;
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;
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;
gboolean
do_tests_func (gpointer data)
{
- DBusError error;
- gchar *bus_name;
+ DBusError error;
+ const gchar *bus_name;
gchar *expected_string;
gchar *result_string;
dbus_error_init (&error);
main_loop = g_main_loop_new(NULL, FALSE);
bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
- dbus_connection_setup_with_g_main(bus, g_main_context_default());
+ atspi_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