[daemon-fix] fixed getting uid and pid when transport is not kdbus

[platform/upstream/dbus.git] / test / test-utils.h

diff --git a/test/test-utils.h b/test/test-utils.h
index 3e1e55e..0d3f369 100644 (file)
--- a/test/test-utils.h
+++ b/test/test-utils.h
@@ -1,25 +1,38 @@
 #ifndef TEST_UTILS_H
 #define TEST_UTILS_H
-#ifndef DBUS_COMPILATION
-#define DBUS_COMPILATION /* Cheat and use private stuff */
-#endif
-#include <dbus/dbus.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <dbus/dbus-mainloop.h>
-#include <dbus/dbus-internals.h>
-#undef DBUS_COMPILATION
 
-dbus_bool_t test_connection_setup                 (DBusLoop       *loop,
+#include <dbus/dbus.h>
+
+#ifdef DBUS_TEST_USE_INTERNAL
+
+# include <dbus/dbus-mainloop.h>
+# include <dbus/dbus-internals.h>
+  typedef DBusLoop TestMainContext;
+
+#else /* !DBUS_TEST_USE_INTERNAL */
+
+# include <glib.h>
+  typedef GMainContext TestMainContext;
+
+#endif /* !DBUS_TEST_USE_INTERNAL */
+
+TestMainContext *test_main_context_get            (void);
+TestMainContext *test_main_context_ref            (TestMainContext *ctx);
+void             test_main_context_unref          (TestMainContext *ctx);
+void             test_main_context_iterate        (TestMainContext *ctx,
+                                                   dbus_bool_t      may_block);
+
+dbus_bool_t test_connection_setup                 (TestMainContext *ctx,
                                                    DBusConnection *connection);
-void        test_connection_shutdown              (DBusLoop       *loop,
+void        test_connection_shutdown              (TestMainContext *ctx,
                                                    DBusConnection *connection);
-void        test_connection_dispatch_all_messages (DBusConnection *connection);
-dbus_bool_t test_connection_dispatch_one_message  (DBusConnection *connection);
 
-dbus_bool_t test_server_setup                     (DBusLoop      *loop,
+dbus_bool_t test_server_setup                     (TestMainContext *ctx,
                                                    DBusServer    *server);
-void        test_server_shutdown                  (DBusLoop      *loop,
+void        test_server_shutdown                  (TestMainContext *ctx,
                                                    DBusServer    *server);
 
 #endif