summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/dbus/test-entity.c12
-rw-r--r--tests/dbus/test-log-manager.c6
-rw-r--r--tests/dbus/test-tpl-log-iter-pidgin.c8
-rw-r--r--tests/dbus/test-tpl-log-iter-xml.c4
-rw-r--r--tests/dbus/test-tpl-log-store-pidgin.c4
-rw-r--r--tests/dbus/test-tpl-log-store-sqlite.c4
-rw-r--r--tests/dbus/test-tpl-log-store-xml.c10
-rw-r--r--tests/dbus/test-tpl-log-walker.c8
-rw-r--r--tests/lib/logger-test-helper.c6
-rw-r--r--tests/lib/logger-test-helper.h2
-rw-r--r--tests/lib/util.c6
11 files changed, 35 insertions, 35 deletions
diff --git a/tests/dbus/test-entity.c b/tests/dbus/test-entity.c
index a0645fb..e49b5fd 100644
--- a/tests/dbus/test-entity.c
+++ b/tests/dbus/test-entity.c
@@ -61,8 +61,8 @@ ensure_contact_cb (GObject *source,
Result *result = user_data;
GError *error = NULL;
- result->contact = tp_simple_client_factory_ensure_contact_by_id_finish (
- TP_SIMPLE_CLIENT_FACTORY (source), op_result, &error);
+ result->contact = tp_client_factory_ensure_contact_by_id_finish (
+ TP_CLIENT_FACTORY (source), op_result, &error);
g_assert_no_error (error);
g_assert (TP_IS_CONTACT (result->contact));
@@ -83,7 +83,7 @@ test_entity_instantiation_from_tp_contact (void)
Result result;
TplEntity *entity;
TpContact *alice, *bob;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
tp_tests_create_and_connect_conn (TP_TESTS_TYPE_CONTACTS_CONNECTION,
"me@test.com", &base_connection, &client_connection);
@@ -105,19 +105,19 @@ test_entity_instantiation_from_tp_contact (void)
avatar_tokens);
factory = tp_proxy_get_factory (client_connection);
- tp_simple_client_factory_add_contact_features_varargs (factory,
+ tp_client_factory_add_contact_features_varargs (factory,
TP_CONTACT_FEATURE_ALIAS,
TP_CONTACT_FEATURE_AVATAR_TOKEN,
TP_CONTACT_FEATURE_INVALID);
result.loop = g_main_loop_new (NULL, FALSE);
- tp_simple_client_factory_ensure_contact_by_id_async (factory,
+ tp_client_factory_ensure_contact_by_id_async (factory,
client_connection, "alice", ensure_contact_cb, &result);
g_main_loop_run (result.loop);
alice = result.contact;
- tp_simple_client_factory_ensure_contact_by_id_async (factory,
+ tp_client_factory_ensure_contact_by_id_async (factory,
client_connection, "bob", ensure_contact_cb, &result);
g_main_loop_run (result.loop);
bob = result.contact;
diff --git a/tests/dbus/test-log-manager.c b/tests/dbus/test-log-manager.c
index 3a2bf3f..11edfb3 100644
--- a/tests/dbus/test-log-manager.c
+++ b/tests/dbus/test-log-manager.c
@@ -30,7 +30,7 @@ typedef struct
TpDBusDaemon *dbus;
TpAccount *account;
TpTestsSimpleAccount *account_service;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
GList *ret;
@@ -206,7 +206,7 @@ setup_service (TestCaseFixture* fixture,
fixture->factory = _tpl_client_factory_dup (fixture->dbus);
- fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+ fixture->account = tp_client_factory_ensure_account (fixture->factory,
account_path, NULL, NULL);
g_assert (fixture->account != NULL);
@@ -402,7 +402,7 @@ test_get_events_for_date_account_unprepared (TestCaseFixture *fixture,
account_path = g_value_get_string (
(const GValue *) g_hash_table_lookup (params, "account-path"));
- account = tp_simple_client_factory_ensure_account (fixture->factory,
+ account = tp_client_factory_ensure_account (fixture->factory,
account_path, NULL, NULL);
g_assert (!tp_proxy_is_prepared (account, TP_ACCOUNT_FEATURE_CORE));
diff --git a/tests/dbus/test-tpl-log-iter-pidgin.c b/tests/dbus/test-tpl-log-iter-pidgin.c
index 5bff6d8..11e1b5e 100644
--- a/tests/dbus/test-tpl-log-iter-pidgin.c
+++ b/tests/dbus/test-tpl-log-iter-pidgin.c
@@ -22,7 +22,7 @@ typedef struct
TplLogStore *store;
TpAccount *account;
TpDBusDaemon *bus;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
TpTestsSimpleAccount *account_service;
} PidginTestCaseFixture;
@@ -88,17 +88,17 @@ setup (PidginTestCaseFixture* fixture,
account_path,
fixture->account_service);
- fixture->factory = tp_simple_client_factory_new (fixture->bus);
+ fixture->factory = tp_client_factory_new (fixture->bus);
g_assert (fixture->factory != NULL);
- fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+ fixture->account = tp_client_factory_ensure_account (fixture->factory,
tp_asv_get_string (params, "account-path"),
params,
&error);
g_assert_no_error (error);
g_assert (fixture->account != NULL);
- features = tp_simple_client_factory_dup_account_features (fixture->factory,
+ features = tp_client_factory_dup_account_features (fixture->factory,
fixture->account);
tp_proxy_prepare_async (fixture->account,
diff --git a/tests/dbus/test-tpl-log-iter-xml.c b/tests/dbus/test-tpl-log-iter-xml.c
index a8f865d..9053f7d 100644
--- a/tests/dbus/test-tpl-log-iter-xml.c
+++ b/tests/dbus/test-tpl-log-iter-xml.c
@@ -23,7 +23,7 @@ typedef struct
TplLogStore *store;
TpAccount *account;
TpDBusDaemon *bus;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
TpTestsSimpleAccount *account_service;
} XmlTestCaseFixture;
@@ -49,7 +49,7 @@ setup (XmlTestCaseFixture* fixture,
&error);
g_assert_no_error (error);
- fixture->factory = tp_simple_client_factory_new (fixture->bus);
+ fixture->factory = tp_client_factory_new (fixture->bus);
g_assert (fixture->factory != NULL);
tpl_test_create_and_prepare_account (fixture->bus, fixture->factory,
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 411860d..edd3ddb 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -35,7 +35,7 @@ typedef struct
TpDBusDaemon *dbus;
TpAccount *account;
TpTestsSimpleAccount *account_service;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
TplLogStorePidgin *store;
TplEntity *room;
@@ -151,7 +151,7 @@ setup_service (PidginTestCaseFixture* fixture,
fixture->factory = _tpl_client_factory_dup (fixture->dbus);
- fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+ fixture->account = tp_client_factory_ensure_account (fixture->factory,
account_path, NULL, NULL);
g_assert (fixture->account != NULL);
diff --git a/tests/dbus/test-tpl-log-store-sqlite.c b/tests/dbus/test-tpl-log-store-sqlite.c
index f9a25e1..c65718a 100644
--- a/tests/dbus/test-tpl-log-store-sqlite.c
+++ b/tests/dbus/test-tpl-log-store-sqlite.c
@@ -11,7 +11,7 @@ main (int argc, char **argv)
TpDBusDaemon *bus;
TpAccount *account;
GError *error = NULL;
- TpSimpleClientFactory* factory;
+ TpClientFactory* factory;
g_type_init ();
@@ -22,7 +22,7 @@ main (int argc, char **argv)
factory = _tpl_client_factory_dup (bus);
- account = tp_simple_client_factory_ensure_account (factory,
+ account = tp_client_factory_ensure_account (factory,
TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/danielle_2emadeley_40collabora_2eco_2euk0",
NULL, &error);
g_assert_no_error (error);
diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
index e2bd4d8..22c6d9c 100644
--- a/tests/dbus/test-tpl-log-store-xml.c
+++ b/tests/dbus/test-tpl-log-store-xml.c
@@ -24,7 +24,7 @@ typedef struct
gchar *tmp_basedir;
TplLogStore *store;
TpDBusDaemon *bus;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
} XmlTestCaseFixture;
@@ -160,7 +160,7 @@ test_clear_account (XmlTestCaseFixture *fixture,
tpl_log_manager_search_free (hits);
- account = tp_simple_client_factory_ensure_account (fixture->factory,
+ account = tp_client_factory_ensure_account (fixture->factory,
TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
NULL, &error);
@@ -227,7 +227,7 @@ test_clear_entity (XmlTestCaseFixture *fixture,
tpl_log_manager_search_free (hits);
- account = tp_simple_client_factory_ensure_account (fixture->factory,
+ account = tp_client_factory_ensure_account (fixture->factory,
TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
NULL, &error);
@@ -877,13 +877,13 @@ test_exists (XmlTestCaseFixture *fixture,
TplEntity *user2, *user3;
GError *error = NULL;
- account1 = tp_simple_client_factory_ensure_account (fixture->factory,
+ account1 = tp_client_factory_ensure_account (fixture->factory,
TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/test2_40collabora_2eco_2euk0",
NULL, &error);
g_assert_no_error (error);
g_assert (account1 != NULL);
- account2 = tp_simple_client_factory_ensure_account (fixture->factory,
+ account2 = tp_client_factory_ensure_account (fixture->factory,
TP_ACCOUNT_OBJECT_PATH_BASE "gabble/jabber/user_40collabora_2eco_2euk",
NULL, &error);
g_assert_no_error (error);
diff --git a/tests/dbus/test-tpl-log-walker.c b/tests/dbus/test-tpl-log-walker.c
index d8b5b9f..b924a12 100644
--- a/tests/dbus/test-tpl-log-walker.c
+++ b/tests/dbus/test-tpl-log-walker.c
@@ -24,7 +24,7 @@ typedef struct
TplLogManager *manager;
TpAccount *account;
TpDBusDaemon *bus;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
TpTestsSimpleAccount *account_service;
} WalkerTestCaseFixture;
@@ -88,17 +88,17 @@ setup (WalkerTestCaseFixture* fixture,
account_path,
fixture->account_service);
- fixture->factory = tp_simple_client_factory_new (fixture->bus);
+ fixture->factory = tp_client_factory_new (fixture->bus);
g_assert (fixture->factory != NULL);
- fixture->account = tp_simple_client_factory_ensure_account (fixture->factory,
+ fixture->account = tp_client_factory_ensure_account (fixture->factory,
tp_asv_get_string (params, "account-path"),
params,
&error);
g_assert_no_error (error);
g_assert (fixture->account != NULL);
- features = tp_simple_client_factory_dup_account_features (fixture->factory,
+ features = tp_client_factory_dup_account_features (fixture->factory,
fixture->account);
tp_proxy_prepare_async (fixture->account,
diff --git a/tests/lib/logger-test-helper.c b/tests/lib/logger-test-helper.c
index 6c5a59b..fd20baf 100644
--- a/tests/lib/logger-test-helper.c
+++ b/tests/lib/logger-test-helper.c
@@ -28,7 +28,7 @@
void
tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
- TpSimpleClientFactory *factory,
+ TpClientFactory *factory,
const gchar *path,
TpAccount **account,
TpTestsSimpleAccount **account_service)
@@ -43,12 +43,12 @@ tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
tp_dbus_daemon_register_object (dbus, path, *account_service);
- *account = tp_simple_client_factory_ensure_account (factory, path, NULL,
+ *account = tp_client_factory_ensure_account (factory, path, NULL,
&error);
g_assert_no_error (error);
g_assert (*account != NULL);
- features = tp_simple_client_factory_dup_account_features (factory, *account);
+ features = tp_client_factory_dup_account_features (factory, *account);
g_array_append_val (features, zero);
tp_tests_proxy_run_until_prepared (*account, (GQuark *) features->data);
diff --git a/tests/lib/logger-test-helper.h b/tests/lib/logger-test-helper.h
index 91f27b4..cb836f2 100644
--- a/tests/lib/logger-test-helper.h
+++ b/tests/lib/logger-test-helper.h
@@ -26,7 +26,7 @@
#include "simple-account.h"
void tpl_test_create_and_prepare_account (TpDBusDaemon *dbus,
- TpSimpleClientFactory *factory,
+ TpClientFactory *factory,
const gchar *path,
TpAccount **account,
TpTestsSimpleAccount **account_service);
diff --git a/tests/lib/util.c b/tests/lib/util.c
index 6fd7b1b..51dc5f2 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -204,7 +204,7 @@ tp_tests_create_conn (GType conn_type,
TpConnection **client_conn)
{
TpDBusDaemon *dbus;
- TpSimpleClientFactory *factory;
+ TpClientFactory *factory;
gchar *name;
gchar *conn_path;
GError *error = NULL;
@@ -213,7 +213,7 @@ tp_tests_create_conn (GType conn_type,
g_assert (client_conn != NULL);
dbus = tp_tests_dbus_daemon_dup_or_die ();
- factory = (TpSimpleClientFactory *) tp_automatic_client_factory_new (dbus);
+ factory = (TpClientFactory *) tp_automatic_client_factory_new (dbus);
*service_conn = tp_tests_object_new_static_class (
conn_type,
@@ -226,7 +226,7 @@ tp_tests_create_conn (GType conn_type,
&name, &conn_path, &error));
g_assert_no_error (error);
- *client_conn = tp_simple_client_factory_ensure_connection (factory,
+ *client_conn = tp_client_factory_ensure_connection (factory,
conn_path, NULL, &error);
g_assert (*client_conn != NULL);
g_assert_no_error (error);
View Lorry Controller Status