diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-25 10:00:54 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-25 16:36:30 +0200 |
commit | fa4c04412ae02c77d58a58b36da338f5b7a640ba (patch) | |
tree | b8885fd7e697c19ab0b471b158a7b3cc55516660 /tests/lib/util.h | |
parent | b5939d56b83f1c125dfd6693e881290d513fa67d (diff) | |
download | telepathy-logger-fa4c04412ae02c77d58a58b36da338f5b7a640ba.tar.gz |
tests/lib: sync with tp-glib master
Add room-list-chan.c as it's used by simple-conn.
https://bugs.freedesktop.org/show_bug.cgi?id=69797
Diffstat (limited to 'tests/lib/util.h')
-rw-r--r-- | tests/lib/util.h | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/tests/lib/util.h b/tests/lib/util.h index ba96c7b..42c9489 100644 --- a/tests/lib/util.h +++ b/tests/lib/util.h @@ -18,10 +18,6 @@ TpDBusDaemon *tp_tests_dbus_daemon_dup_or_die (void); void tp_tests_proxy_run_until_dbus_queue_processed (gpointer proxy); -TpHandle tp_tests_connection_run_request_contact_handle ( - TpConnection *connection, - const gchar *id); - void tp_tests_proxy_run_until_prepared (gpointer proxy, const GQuark *features); gboolean tp_tests_proxy_run_until_prepared_or_failed (gpointer proxy, @@ -40,6 +36,18 @@ void _tp_tests_assert_strv_equals (const char *file, int line, const char *actual_desc, gconstpointer actual_strv, const char *expected_desc, gconstpointer expected_strv); +#define tp_tests_assert_bytes_equals(actual, expected, expected_length) \ + _tp_tests_assert_bytes_equal (__FILE__, __LINE__, \ + actual, expected, expected_length) +void _tp_tests_assert_bytes_equal (const gchar *file, int line, + GBytes *actual, gconstpointer expected_data, gsize expected_length); + +void tp_tests_create_conn (GType conn_type, + const gchar *account, + gboolean connect, + TpBaseConnection **service_conn, + TpConnection **client_conn); + void tp_tests_create_and_connect_conn (GType conn_type, const gchar *account, TpBaseConnection **service_conn, @@ -54,6 +62,26 @@ void tp_tests_result_ready_cb (GObject *object, void tp_tests_abort_after (guint sec); +void tp_tests_init (int *argc, + char ***argv); + +GValue *_tp_create_local_socket (TpSocketAddressType address_type, + TpSocketAccessControl access_control, + GSocketService **service, + gchar **unix_address, + gchar **unix_tmpdir, + GError **error); + +void _tp_destroy_socket_control_list (gpointer data); + +void tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection); + +TpContact *tp_tests_connection_run_until_contact_by_id ( + TpConnection *connection, + const gchar *id, + guint n_features, + const TpContactFeature *features); + void tp_tests_copy_dir (const gchar *from_dir, const gchar *to_dir); #endif /* #ifndef __TP_TESTS_LIB_UTIL_H__ */ |