[folks] Tests: Change namespace to TpTests instead of TpTest
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Tests: Change namespace to TpTests instead of TpTest
- Date: Wed, 28 Mar 2012 12:17:15 +0000 (UTC)
commit 98e2bf01ff5d51070719c7674ba6b0c2b942145f
Author: Xavier Claessens <xavier claessens collabora co uk>
Date: Tue Mar 27 17:13:50 2012 +0200
Tests: Change namespace to TpTests instead of TpTest
Files from telepathy-glib are in TpTests namespace, so this
will facilitate copying verbatim copy.
tests/folks/aggregation.vala | 6 +-
tests/folks/backend-loading.vala | 4 +-
tests/folks/init.vala | 4 +-
tests/lib/telepathy/contactlist/Makefile.am | 2 +-
tests/lib/telepathy/contactlist/account-manager.c | 48 ++--
tests/lib/telepathy/contactlist/account-manager.h | 56 ++--
tests/lib/telepathy/contactlist/account.c | 46 ++--
tests/lib/telepathy/contactlist/account.h | 54 ++--
tests/lib/telepathy/contactlist/backend.c | 88 +++---
tests/lib/telepathy/contactlist/backend.h | 52 ++--
tests/lib/telepathy/contactlist/conn.c | 172 ++++++------
tests/lib/telepathy/contactlist/conn.h | 60 ++--
.../telepathy/contactlist/contact-list-manager.c | 306 ++++++++++----------
.../telepathy/contactlist/contact-list-manager.h | 124 ++++----
tests/lib/telepathy/contactlist/contact-list.c | 114 ++++----
tests/lib/telepathy/contactlist/contact-list.h | 158 +++++-----
tests/telepathy/fake-tp-backend.vala | 4 +-
tests/telepathy/individual-properties.vala | 6 +-
tests/telepathy/individual-retrieval.vala | 6 +-
tests/telepathy/init.vala | 4 +-
tests/telepathy/persona-store-capabilities.vala | 6 +-
21 files changed, 660 insertions(+), 660 deletions(-)
---
diff --git a/tests/folks/aggregation.vala b/tests/folks/aggregation.vala
index cf7d6ba..df5de17 100644
--- a/tests/folks/aggregation.vala
+++ b/tests/folks/aggregation.vala
@@ -19,12 +19,12 @@
using Gee;
using Folks;
-using TpTest;
+using TpTests;
public class AggregationTests : Folks.TestCase
{
private KfTest.Backend _kf_backend;
- private TpTest.Backend _tp_backend;
+ private TpTests.Backend _tp_backend;
private HashSet<string> _default_personas;
private int _test_timeout = 3;
@@ -33,7 +33,7 @@ public class AggregationTests : Folks.TestCase
base ("Aggregation");
this._kf_backend = new KfTest.Backend ();
- this._tp_backend = new TpTest.Backend ();
+ this._tp_backend = new TpTests.Backend ();
/* Create a set of the individuals we expect to see */
this._default_personas = new HashSet<string> (str_hash, str_equal);
diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala
index d8f02f8..ebe679f 100644
--- a/tests/folks/backend-loading.vala
+++ b/tests/folks/backend-loading.vala
@@ -22,7 +22,7 @@ using Folks;
public class BackendLoadingTests : Folks.TestCase
{
- private TpTest.Backend _tp_backend;
+ private TpTests.Backend _tp_backend;
private void* _account_handle;
private MainLoop main_loop;
private static const string STORE_FILE_PATH = "folks-test-backend-store.ini";
@@ -31,7 +31,7 @@ public class BackendLoadingTests : Folks.TestCase
{
base ("BackendLoading");
- this._tp_backend = new TpTest.Backend ();
+ this._tp_backend = new TpTests.Backend ();
this.add_test ("load and prep", this.test_load_and_prep);
this.add_test ("disabling", this.test_disabling);
diff --git a/tests/folks/init.vala b/tests/folks/init.vala
index 7ab4b9e..9e37775 100644
--- a/tests/folks/init.vala
+++ b/tests/folks/init.vala
@@ -24,7 +24,7 @@ using Folks;
public class InitTests : Folks.TestCase
{
private KfTest.Backend _kf_backend;
- private TpTest.Backend _tp_backend;
+ private TpTests.Backend _tp_backend;
private int _test_timeout = 5;
public InitTests ()
@@ -32,7 +32,7 @@ public class InitTests : Folks.TestCase
base ("Init");
this._kf_backend = new KfTest.Backend ();
- this._tp_backend = new TpTest.Backend ();
+ this._tp_backend = new TpTests.Backend ();
/* Set up the tests */
this.add_test ("looped", this.test_looped);
diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index d3e1e2e..f419bd4 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -63,7 +63,7 @@ tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS)
tp_test_contactlist_gir_LIBS = libtp-test-contactlist.la
tp_test_contactlist_gir_FILES = $(libtp_test_contactlist_la_SOURCES)
-tp_test_contactlist_gir_NAMESPACE = TpTest
+tp_test_contactlist_gir_NAMESPACE = TpTests
INTROSPECTION_GIRS += tp-test-contactlist.gir
if HAVE_VALA
diff --git a/tests/lib/telepathy/contactlist/account-manager.c b/tests/lib/telepathy/contactlist/account-manager.c
index 6c3191b..e8e12b5 100644
--- a/tests/lib/telepathy/contactlist/account-manager.c
+++ b/tests/lib/telepathy/contactlist/account-manager.c
@@ -20,8 +20,8 @@
static void account_manager_iface_init (gpointer, gpointer);
-G_DEFINE_TYPE_WITH_CODE (TpTestAccountManager,
- tp_test_account_manager,
+G_DEFINE_TYPE_WITH_CODE (TpTestsAccountManager,
+ tp_tests_account_manager,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_MANAGER,
account_manager_iface_init);
@@ -45,13 +45,13 @@ enum
PROP_INVALID_ACCOUNTS,
};
-struct _TpTestAccountManagerPrivate
+struct _TpTestsAccountManagerPrivate
{
GPtrArray *valid_accounts;
};
static void
-tp_test_account_manager_create_account (TpSvcAccountManager *self,
+tp_tests_account_manager_create_account (TpSvcAccountManager *self,
const gchar *in_Connection_Manager,
const gchar *in_Protocol,
const gchar *in_Display_Name,
@@ -69,37 +69,37 @@ account_manager_iface_init (gpointer klass,
gpointer unused G_GNUC_UNUSED)
{
#define IMPLEMENT(x) tp_svc_account_manager_implement_##x (\
- klass, tp_test_account_manager_##x)
+ klass, tp_tests_account_manager_##x)
IMPLEMENT (create_account);
#undef IMPLEMENT
}
static void
-tp_test_account_manager_init (TpTestAccountManager *self)
+tp_tests_account_manager_init (TpTestsAccountManager *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- TP_TEST_TYPE_ACCOUNT_MANAGER, TpTestAccountManagerPrivate);
+ TP_TESTS_TYPE_ACCOUNT_MANAGER, TpTestsAccountManagerPrivate);
self->priv->valid_accounts =
g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
}
static void
-tp_test_account_manager_finalize (GObject *obj)
+tp_tests_account_manager_finalize (GObject *obj)
{
- g_ptr_array_free (TP_TEST_ACCOUNT_MANAGER (obj)->priv->valid_accounts, TRUE);
+ g_ptr_array_free (TP_TESTS_ACCOUNT_MANAGER (obj)->priv->valid_accounts, TRUE);
- G_OBJECT_CLASS (tp_test_account_manager_parent_class)->finalize (obj);
+ G_OBJECT_CLASS (tp_tests_account_manager_parent_class)->finalize (obj);
}
static void
-tp_test_account_manager_get_property (GObject *object,
+tp_tests_account_manager_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *spec)
{
- TpTestAccountManagerPrivate *priv = TP_TEST_ACCOUNT_MANAGER (object)->priv;
+ TpTestsAccountManagerPrivate *priv = TP_TESTS_ACCOUNT_MANAGER (object)->priv;
GPtrArray *accounts;
guint i = 0;
@@ -140,8 +140,8 @@ tp_test_account_manager_get_property (GObject *object,
* too.
*/
static void
-tp_test_account_manager_class_init (
- TpTestAccountManagerClass *klass)
+tp_tests_account_manager_class_init (
+ TpTestsAccountManagerClass *klass)
{
GObjectClass *object_class = (GObjectClass *) klass;
GParamSpec *param_spec;
@@ -165,9 +165,9 @@ tp_test_account_manager_class_init (
{ NULL },
};
- g_type_class_add_private (klass, sizeof (TpTestAccountManagerPrivate));
- object_class->get_property = tp_test_account_manager_get_property;
- object_class->finalize = tp_test_account_manager_finalize;
+ g_type_class_add_private (klass, sizeof (TpTestsAccountManagerPrivate));
+ object_class->get_property = tp_tests_account_manager_get_property;
+ object_class->finalize = tp_tests_account_manager_finalize;
param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
"In this case we only implement AccountManager, so none.",
@@ -187,17 +187,17 @@ tp_test_account_manager_class_init (
klass->dbus_props_class.interfaces = prop_interfaces;
tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestAccountManagerClass, dbus_props_class));
+ G_STRUCT_OFFSET (TpTestsAccountManagerClass, dbus_props_class));
}
-TpTestAccountManager *
-tp_test_account_manager_new (void)
+TpTestsAccountManager *
+tp_tests_account_manager_new (void)
{
- return g_object_new (TP_TEST_TYPE_ACCOUNT_MANAGER, NULL);
+ return g_object_new (TP_TESTS_TYPE_ACCOUNT_MANAGER, NULL);
}
void
-tp_test_account_manager_add_account (TpTestAccountManager *self,
+tp_tests_account_manager_add_account (TpTestsAccountManager *self,
const gchar *account_path)
{
g_ptr_array_add (self->priv->valid_accounts, g_strdup (account_path));
@@ -206,10 +206,10 @@ tp_test_account_manager_add_account (TpTestAccountManager *self,
}
void
-tp_test_account_manager_remove_account (TpTestAccountManager *self,
+tp_tests_account_manager_remove_account (TpTestsAccountManager *self,
const gchar *account_path)
{
- TpTestAccountManagerPrivate *priv = self->priv;
+ TpTestsAccountManagerPrivate *priv = self->priv;
guint i;
for (i = 0; i < priv->valid_accounts->len; i++)
diff --git a/tests/lib/telepathy/contactlist/account-manager.h b/tests/lib/telepathy/contactlist/account-manager.h
index a780f97..7487bd8 100644
--- a/tests/lib/telepathy/contactlist/account-manager.h
+++ b/tests/lib/telepathy/contactlist/account-manager.h
@@ -11,8 +11,8 @@
* Copied from telepathy-glib/tests/lib/simple-account-manager.h.
*/
-#ifndef __TP_TEST_ACCOUNT_MANAGER_H__
-#define __TP_TEST_ACCOUNT_MANAGER_H__
+#ifndef __TP_TESTS_ACCOUNT_MANAGER_H__
+#define __TP_TESTS_ACCOUNT_MANAGER_H__
#include <glib-object.h>
#include <telepathy-glib/dbus-properties-mixin.h>
@@ -20,47 +20,47 @@
G_BEGIN_DECLS
-typedef struct _TpTestAccountManager TpTestAccountManager;
-typedef struct _TpTestAccountManagerClass TpTestAccountManagerClass;
-typedef struct _TpTestAccountManagerPrivate TpTestAccountManagerPrivate;
+typedef struct _TpTestsAccountManager TpTestsAccountManager;
+typedef struct _TpTestsAccountManagerClass TpTestsAccountManagerClass;
+typedef struct _TpTestsAccountManagerPrivate TpTestsAccountManagerPrivate;
-struct _TpTestAccountManagerClass {
+struct _TpTestsAccountManagerClass {
GObjectClass parent_class;
TpDBusPropertiesMixinClass dbus_props_class;
};
-struct _TpTestAccountManager {
+struct _TpTestsAccountManager {
GObject parent;
- TpTestAccountManagerPrivate *priv;
+ TpTestsAccountManagerPrivate *priv;
};
-GType tp_test_account_manager_get_type (void);
+GType tp_tests_account_manager_get_type (void);
/* TYPE MACROS */
-#define TP_TEST_TYPE_ACCOUNT_MANAGER \
- (tp_test_account_manager_get_type ())
-#define TP_TEST_ACCOUNT_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TEST_TYPE_ACCOUNT_MANAGER, \
- TpTestAccountManager))
-#define TP_TEST_ACCOUNT_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TEST_TYPE_ACCOUNT_MANAGER, \
- TpTestAccountManagerClass))
-#define IS_TP_TEST_ACCOUNT_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TEST_TYPE_ACCOUNT_MANAGER))
-#define TP_TEST_IS_ACCOUNT_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TEST_TYPE_ACCOUNT_MANAGER))
-#define TP_TEST_ACCOUNT_MANAGER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_ACCOUNT_MANAGER, \
- TpTestAccountManagerClass))
+#define TP_TESTS_TYPE_ACCOUNT_MANAGER \
+ (tp_tests_account_manager_get_type ())
+#define TP_TESTS_ACCOUNT_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TESTS_TYPE_ACCOUNT_MANAGER, \
+ TpTestsAccountManager))
+#define TP_TESTS_ACCOUNT_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), TP_TESTS_TYPE_ACCOUNT_MANAGER, \
+ TpTestsAccountManagerClass))
+#define IS_TP_TESTS_ACCOUNT_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TESTS_TYPE_ACCOUNT_MANAGER))
+#define TP_TESTS_IS_ACCOUNT_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TESTS_TYPE_ACCOUNT_MANAGER))
+#define TP_TESTS_ACCOUNT_MANAGER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_ACCOUNT_MANAGER, \
+ TpTestsAccountManagerClass))
-TpTestAccountManager *tp_test_account_manager_new (void);
+TpTestsAccountManager *tp_tests_account_manager_new (void);
-void tp_test_account_manager_add_account (TpTestAccountManager *self,
+void tp_tests_account_manager_add_account (TpTestsAccountManager *self,
const gchar *account_path);
-void tp_test_account_manager_remove_account (TpTestAccountManager *self,
+void tp_tests_account_manager_remove_account (TpTestsAccountManager *self,
const gchar *account_path);
G_END_DECLS
-#endif /* #ifndef __TP_TEST_ACCOUNT_MANAGER_H__ */
+#endif /* #ifndef __TP_TESTS_ACCOUNT_MANAGER_H__ */
diff --git a/tests/lib/telepathy/contactlist/account.c b/tests/lib/telepathy/contactlist/account.c
index 06a5893..1410f51 100644
--- a/tests/lib/telepathy/contactlist/account.c
+++ b/tests/lib/telepathy/contactlist/account.c
@@ -23,8 +23,8 @@
static void account_iface_init (gpointer, gpointer);
-G_DEFINE_TYPE_WITH_CODE (TpTestAccount,
- tp_test_account,
+G_DEFINE_TYPE_WITH_CODE (TpTestsAccount,
+ tp_tests_account,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT,
account_iface_init);
@@ -56,7 +56,7 @@ enum
PROP_HAS_BEEN_ONLINE,
};
-struct _TpTestAccountPrivate
+struct _TpTestsAccountPrivate
{
gchar *connection_path;
};
@@ -66,27 +66,27 @@ account_iface_init (gpointer klass,
gpointer unused G_GNUC_UNUSED)
{
#define IMPLEMENT(x) tp_svc_account_implement_##x (\
- klass, tp_test_account_##x)
+ klass, tp_tests_account_##x)
/* TODO */
#undef IMPLEMENT
}
static void
-tp_test_account_init (TpTestAccount *self)
+tp_tests_account_init (TpTestsAccount *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TEST_TYPE_ACCOUNT,
- TpTestAccountPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TESTS_TYPE_ACCOUNT,
+ TpTestsAccountPrivate);
}
static void
-tp_test_account_get_property (GObject *object,
+tp_tests_account_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *spec)
{
GValueArray *presence;
- TpTestAccountPrivate *priv = TP_TEST_ACCOUNT (object)->priv;
+ TpTestsAccountPrivate *priv = TP_TESTS_ACCOUNT (object)->priv;
presence = tp_value_array_build (3,
G_TYPE_UINT, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE,
@@ -152,12 +152,12 @@ tp_test_account_get_property (GObject *object,
}
static void
-tp_test_account_set_property (GObject *object,
+tp_tests_account_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *spec)
{
- TpTestAccountPrivate *priv = TP_TEST_ACCOUNT (object)->priv;
+ TpTestsAccountPrivate *priv = TP_TESTS_ACCOUNT (object)->priv;
switch (property_id) {
case PROP_CONNECTION:
@@ -170,13 +170,13 @@ tp_test_account_set_property (GObject *object,
}
static void
-tp_test_account_finalize (GObject *object)
+tp_tests_account_finalize (GObject *object)
{
- TpTestAccountPrivate *priv = TP_TEST_ACCOUNT (object)->priv;
+ TpTestsAccountPrivate *priv = TP_TESTS_ACCOUNT (object)->priv;
g_free (priv->connection_path);
- G_OBJECT_CLASS (tp_test_account_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tp_tests_account_parent_class)->finalize (object);
}
/**
@@ -185,7 +185,7 @@ tp_test_account_finalize (GObject *object)
* Properties.GetAll().
*/
static void
-tp_test_account_class_init (TpTestAccountClass *klass)
+tp_tests_account_class_init (TpTestsAccountClass *klass)
{
GObjectClass *object_class = (GObjectClass *) klass;
GParamSpec *param_spec;
@@ -219,10 +219,10 @@ tp_test_account_class_init (TpTestAccountClass *klass)
{ NULL },
};
- g_type_class_add_private (klass, sizeof (TpTestAccountPrivate));
- object_class->get_property = tp_test_account_get_property;
- object_class->set_property = tp_test_account_set_property;
- object_class->finalize = tp_test_account_finalize;
+ g_type_class_add_private (klass, sizeof (TpTestsAccountPrivate));
+ object_class->get_property = tp_tests_account_get_property;
+ object_class->set_property = tp_tests_account_set_property;
+ object_class->finalize = tp_tests_account_finalize;
param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
"In this case we only implement Account, so none.",
@@ -330,12 +330,12 @@ tp_test_account_class_init (TpTestAccountClass *klass)
klass->dbus_props_class.interfaces = prop_interfaces;
tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestAccountClass, dbus_props_class));
+ G_STRUCT_OFFSET (TpTestsAccountClass, dbus_props_class));
}
-TpTestAccount *
-tp_test_account_new (const gchar *connection_path)
+TpTestsAccount *
+tp_tests_account_new (const gchar *connection_path)
{
- return g_object_new (TP_TEST_TYPE_ACCOUNT,
+ return g_object_new (TP_TESTS_TYPE_ACCOUNT,
"connection", connection_path, NULL);
}
diff --git a/tests/lib/telepathy/contactlist/account.h b/tests/lib/telepathy/contactlist/account.h
index 271cbab..1ecff42 100644
--- a/tests/lib/telepathy/contactlist/account.h
+++ b/tests/lib/telepathy/contactlist/account.h
@@ -10,8 +10,8 @@
* Copied from telepathy-glib/tests/lib/simple-account.h.
*/
-#ifndef __TP_TEST_ACCOUNT_H__
-#define __TP_TEST_ACCOUNT_H__
+#ifndef __TP_TESTS_ACCOUNT_H__
+#define __TP_TESTS_ACCOUNT_H__
#include <glib-object.h>
#include <telepathy-glib/dbus-properties-mixin.h>
@@ -19,42 +19,42 @@
G_BEGIN_DECLS
-typedef struct _TpTestAccount TpTestAccount;
-typedef struct _TpTestAccountClass TpTestAccountClass;
-typedef struct _TpTestAccountPrivate TpTestAccountPrivate;
+typedef struct _TpTestsAccount TpTestsAccount;
+typedef struct _TpTestsAccountClass TpTestsAccountClass;
+typedef struct _TpTestsAccountPrivate TpTestsAccountPrivate;
-struct _TpTestAccountClass {
+struct _TpTestsAccountClass {
GObjectClass parent_class;
TpDBusPropertiesMixinClass dbus_props_class;
};
-struct _TpTestAccount {
+struct _TpTestsAccount {
GObject parent;
- TpTestAccountPrivate *priv;
+ TpTestsAccountPrivate *priv;
};
-GType tp_test_account_get_type (void);
+GType tp_tests_account_get_type (void);
/* TYPE MACROS */
-#define TP_TEST_TYPE_ACCOUNT \
- (tp_test_account_get_type ())
-#define TP_TEST_ACCOUNT(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TEST_TYPE_ACCOUNT, \
- TpTestAccount))
-#define TP_TEST_ACCOUNT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TEST_TYPE_ACCOUNT, \
- TpTestAccountClass))
-#define TP_TEST_IS_ACCOUNT(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TEST_TYPE_ACCOUNT))
-#define TP_TEST_IS_ACCOUNT_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TEST_TYPE_ACCOUNT))
-#define TP_TEST_ACCOUNT_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_ACCOUNT, \
- TpTestAccountClass))
-
-TpTestAccount *tp_test_account_new (const gchar *connection_path);
+#define TP_TESTS_TYPE_ACCOUNT \
+ (tp_tests_account_get_type ())
+#define TP_TESTS_ACCOUNT(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TESTS_TYPE_ACCOUNT, \
+ TpTestsAccount))
+#define TP_TESTS_ACCOUNT_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), TP_TESTS_TYPE_ACCOUNT, \
+ TpTestsAccountClass))
+#define TP_TESTS_IS_ACCOUNT(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TESTS_TYPE_ACCOUNT))
+#define TP_TESTS_IS_ACCOUNT_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TESTS_TYPE_ACCOUNT))
+#define TP_TESTS_ACCOUNT_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_ACCOUNT, \
+ TpTestsAccountClass))
+
+TpTestsAccount *tp_tests_account_new (const gchar *connection_path);
G_END_DECLS
-#endif /* #ifndef __TP_TEST_ACCOUNT_H__ */
+#endif /* #ifndef __TP_TESTS_ACCOUNT_H__ */
diff --git a/tests/lib/telepathy/contactlist/backend.c b/tests/lib/telepathy/contactlist/backend.c
index ec257c3..663322b 100644
--- a/tests/lib/telepathy/contactlist/backend.c
+++ b/tests/lib/telepathy/contactlist/backend.c
@@ -32,23 +32,23 @@
#include "backend.h"
-struct _TpTestBackendPrivate
+struct _TpTestsBackendPrivate
{
TpAccountManager *am_proxy;
TpDBusDaemon *daemon;
- TpTestAccountManager *account_manager;
+ TpTestsAccountManager *account_manager;
GList *accounts;
};
typedef struct
{
- TpTestAccount *account;
+ TpTestsAccount *account;
TpBaseConnection *conn;
gchar *bus_name;
gchar *object_path;
} AccountData;
-G_DEFINE_TYPE (TpTestBackend, tp_test_backend, G_TYPE_OBJECT)
+G_DEFINE_TYPE (TpTestsBackend, tp_tests_backend, G_TYPE_OBJECT)
enum
{
@@ -57,39 +57,39 @@ enum
};
static void
-tp_test_backend_init (TpTestBackend *self)
+tp_tests_backend_init (TpTestsBackend *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TEST_TYPE_BACKEND,
- TpTestBackendPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TESTS_TYPE_BACKEND,
+ TpTestsBackendPrivate);
}
static void
-tp_test_backend_finalize (GObject *object)
+tp_tests_backend_finalize (GObject *object)
{
- TpTestBackendPrivate *priv = TP_TEST_BACKEND (object)->priv;
+ TpTestsBackendPrivate *priv = TP_TESTS_BACKEND (object)->priv;
GList *l;
for (l = priv->accounts; l != NULL; l = l->next)
{
- tp_test_backend_remove_account (TP_TEST_BACKEND (object), l->data);
+ tp_tests_backend_remove_account (TP_TESTS_BACKEND (object), l->data);
}
- tp_test_backend_tear_down (TP_TEST_BACKEND (object));
- G_OBJECT_CLASS (tp_test_backend_parent_class)->finalize (object);
+ tp_tests_backend_tear_down (TP_TESTS_BACKEND (object));
+ G_OBJECT_CLASS (tp_tests_backend_parent_class)->finalize (object);
}
static void
-tp_test_backend_get_property (GObject *object,
+tp_tests_backend_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *spec)
{
- TpTestBackend *self = TP_TEST_BACKEND (object);
+ TpTestsBackend *self = TP_TESTS_BACKEND (object);
switch (property_id)
{
case PROP_CONNECTION:
- g_value_set_object (value, tp_test_backend_get_connection (self));
+ g_value_set_object (value, tp_tests_backend_get_connection (self));
break;
default:
@@ -98,7 +98,7 @@ tp_test_backend_get_property (GObject *object,
}
static void
-tp_test_backend_set_property (GObject *object,
+tp_tests_backend_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *spec)
@@ -111,27 +111,27 @@ tp_test_backend_set_property (GObject *object,
}
static void
-tp_test_backend_class_init (TpTestBackendClass *klass)
+tp_tests_backend_class_init (TpTestsBackendClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GParamSpec *param_spec;
- g_type_class_add_private (klass, sizeof (TpTestBackendPrivate));
- object_class->finalize = tp_test_backend_finalize;
- object_class->get_property = tp_test_backend_get_property;
- object_class->set_property = tp_test_backend_set_property;
+ g_type_class_add_private (klass, sizeof (TpTestsBackendPrivate));
+ object_class->finalize = tp_tests_backend_finalize;
+ object_class->get_property = tp_tests_backend_get_property;
+ object_class->set_property = tp_tests_backend_set_property;
param_spec = g_param_spec_object ("connection", "Connection",
"The base ContactListConnection",
- TP_TEST_TYPE_CONTACT_LIST_CONNECTION,
+ TP_TESTS_TYPE_CONTACT_LIST_CONNECTION,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
}
-TpTestBackend *
-tp_test_backend_new (void)
+TpTestsBackend *
+tp_tests_backend_new (void)
{
- return g_object_new (TP_TEST_TYPE_BACKEND, NULL);
+ return g_object_new (TP_TESTS_TYPE_BACKEND, NULL);
}
static gboolean
@@ -178,9 +178,9 @@ _log_fatal_handler (const char *domain,
}
void
-tp_test_backend_set_up (TpTestBackend *self)
+tp_tests_backend_set_up (TpTestsBackend *self)
{
- TpTestBackendPrivate *priv = self->priv;
+ TpTestsBackendPrivate *priv = self->priv;
GError *error = NULL;
/* Override the handler set in the general Folks.TestCase class */
@@ -200,7 +200,7 @@ tp_test_backend_set_up (TpTestBackend *self)
TP_ACCOUNT_MANAGER_BUS_NAME, error->message);
}
- priv->account_manager = tp_test_account_manager_new ();
+ priv->account_manager = tp_tests_account_manager_new ();
tp_dbus_daemon_register_object (priv->daemon, TP_ACCOUNT_MANAGER_OBJECT_PATH,
priv->account_manager);
@@ -208,7 +208,7 @@ tp_test_backend_set_up (TpTestBackend *self)
}
/**
- * tp_test_backend_add_account:
+ * tp_tests_backend_add_account:
* @self:
* @protocol_name:
* @user_id:
@@ -218,13 +218,13 @@ tp_test_backend_set_up (TpTestBackend *self)
* Return value: (transfer none):
*/
gpointer
-tp_test_backend_add_account (TpTestBackend *self,
+tp_tests_backend_add_account (TpTestsBackend *self,
const gchar *protocol_name,
const gchar *user_id,
const gchar *connection_manager_name,
const gchar *account_name)
{
- TpTestBackendPrivate *priv = self->priv;
+ TpTestsBackendPrivate *priv = self->priv;
TpHandleRepoIface *handle_repo;
TpHandle self_handle;
gchar *object_path;
@@ -235,7 +235,7 @@ tp_test_backend_add_account (TpTestBackend *self,
/* Set up a contact list connection */
data->conn =
- TP_BASE_CONNECTION (tp_test_contact_list_connection_new (user_id,
+ TP_BASE_CONNECTION (tp_tests_contact_list_connection_new (user_id,
protocol_name, 0, 0));
tp_base_connection_register (data->conn, connection_manager_name,
@@ -259,14 +259,14 @@ tp_test_backend_add_account (TpTestBackend *self,
TP_CONNECTION_STATUS_CONNECTED, TP_CONNECTION_STATUS_REASON_REQUESTED);
/* Create an account */
- data->account = tp_test_account_new (data->object_path);
+ data->account = tp_tests_account_new (data->object_path);
object_path =
g_strdup_printf ("%s%s/%s/%s", TP_ACCOUNT_OBJECT_PATH_BASE,
connection_manager_name, protocol_name, account_name);
tp_dbus_daemon_register_object (priv->daemon, object_path, data->account);
/* Add the account to the account manager */
- tp_test_account_manager_add_account (priv->account_manager, object_path);
+ tp_tests_account_manager_add_account (priv->account_manager, object_path);
g_free (object_path);
@@ -277,10 +277,10 @@ tp_test_backend_add_account (TpTestBackend *self,
}
void
-tp_test_backend_remove_account (TpTestBackend *self,
+tp_tests_backend_remove_account (TpTestsBackend *self,
gpointer handle)
{
- TpTestBackendPrivate *priv = self->priv;
+ TpTestsBackendPrivate *priv = self->priv;
AccountData *data;
if (g_list_find (priv->accounts, handle) == NULL)
@@ -293,7 +293,7 @@ tp_test_backend_remove_account (TpTestBackend *self,
data = (AccountData *) handle;
/* Remove the account from the account manager */
- tp_test_account_manager_remove_account (priv->account_manager,
+ tp_tests_account_manager_remove_account (priv->account_manager,
data->object_path);
/* Disconnect it */
@@ -312,9 +312,9 @@ tp_test_backend_remove_account (TpTestBackend *self,
}
void
-tp_test_backend_tear_down (TpTestBackend *self)
+tp_tests_backend_tear_down (TpTestsBackend *self)
{
- TpTestBackendPrivate *priv = self->priv;
+ TpTestsBackendPrivate *priv = self->priv;
GError *error = NULL;
/* Make sure all dbus trafic is done */
@@ -336,17 +336,17 @@ tp_test_backend_tear_down (TpTestBackend *self)
}
/**
- * tp_test_backend_get_connection:
+ * tp_tests_backend_get_connection:
* @self: the backend
*
* Returns: (transfer none): the contact list connection or %NULL.
*/
-TpTestContactListConnection *
-tp_test_backend_get_connection (TpTestBackend *self)
+TpTestsContactListConnection *
+tp_tests_backend_get_connection (TpTestsBackend *self)
{
AccountData *data;
- g_return_val_if_fail (TP_TEST_IS_BACKEND (self), NULL);
+ g_return_val_if_fail (TP_TESTS_IS_BACKEND (self), NULL);
if (self->priv->accounts == NULL)
{
@@ -354,5 +354,5 @@ tp_test_backend_get_connection (TpTestBackend *self)
}
data = (AccountData *) self->priv->accounts->data;
- return TP_TEST_CONTACT_LIST_CONNECTION (data->conn);
+ return TP_TESTS_CONTACT_LIST_CONNECTION (data->conn);
}
diff --git a/tests/lib/telepathy/contactlist/backend.h b/tests/lib/telepathy/contactlist/backend.h
index 4e8f01d..77447d5 100644
--- a/tests/lib/telepathy/contactlist/backend.h
+++ b/tests/lib/telepathy/contactlist/backend.h
@@ -18,8 +18,8 @@
* Philip Withnall <philip withnall collabora co uk>
*/
-#ifndef TP_TEST_BACKEND_H
-#define TP_TEST_BACKEND_H
+#ifndef TP_TESTS_BACKEND_H
+#define TP_TESTS_BACKEND_H
#include <glib.h>
#include <glib-object.h>
@@ -28,50 +28,50 @@
G_BEGIN_DECLS
-#define TP_TEST_TYPE_BACKEND (tp_test_backend_get_type ())
-#define TP_TEST_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
- TP_TEST_TYPE_BACKEND, TpTestBackend))
-#define TP_TEST_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
- TP_TEST_TYPE_BACKEND, TpTestBackendClass))
-#define TP_TEST_IS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
- TP_TEST_TYPE_BACKEND))
-#define TP_TEST_IS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
- TP_TEST_TYPE_BACKEND))
-#define TP_TEST_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
- TP_TEST_TYPE_BACKEND, TpTestBackendClass))
+#define TP_TESTS_TYPE_BACKEND (tp_tests_backend_get_type ())
+#define TP_TESTS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+ TP_TESTS_TYPE_BACKEND, TpTestsBackend))
+#define TP_TESTS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), \
+ TP_TESTS_TYPE_BACKEND, TpTestsBackendClass))
+#define TP_TESTS_IS_BACKEND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+ TP_TESTS_TYPE_BACKEND))
+#define TP_TESTS_IS_BACKEND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
+ TP_TESTS_TYPE_BACKEND))
+#define TP_TESTS_BACKEND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
+ TP_TESTS_TYPE_BACKEND, TpTestsBackendClass))
-typedef struct _TpTestBackendPrivate TpTestBackendPrivate;
+typedef struct _TpTestsBackendPrivate TpTestsBackendPrivate;
typedef struct
{
/*< private >*/
GObject parent;
- TpTestBackendPrivate *priv;
-} TpTestBackend;
+ TpTestsBackendPrivate *priv;
+} TpTestsBackend;
typedef struct
{
/*< private > */
GObjectClass parent;
-} TpTestBackendClass;
+} TpTestsBackendClass;
-GType tp_test_backend_get_type (void) G_GNUC_CONST;
+GType tp_tests_backend_get_type (void) G_GNUC_CONST;
-TpTestBackend *tp_test_backend_new (void);
+TpTestsBackend *tp_tests_backend_new (void);
-void tp_test_backend_set_up (TpTestBackend *self);
-void tp_test_backend_tear_down (TpTestBackend *self);
-TpTestContactListConnection *tp_test_backend_get_connection (
- TpTestBackend *self);
+void tp_tests_backend_set_up (TpTestsBackend *self);
+void tp_tests_backend_tear_down (TpTestsBackend *self);
+TpTestsContactListConnection *tp_tests_backend_get_connection (
+ TpTestsBackend *self);
-gpointer tp_test_backend_add_account (TpTestBackend *self,
+gpointer tp_tests_backend_add_account (TpTestsBackend *self,
const gchar *protocol_name,
const gchar *user_id,
const gchar *connection_manager_name,
const gchar *account_name);
-void tp_test_backend_remove_account (TpTestBackend *self,
+void tp_tests_backend_remove_account (TpTestsBackend *self,
gpointer handle);
G_END_DECLS
-#endif /* !TP_TEST_BACKEND_H */
+#endif /* !TP_TESTS_BACKEND_H */
diff --git a/tests/lib/telepathy/contactlist/conn.c b/tests/lib/telepathy/contactlist/conn.c
index 40baf42..9a403d0 100644
--- a/tests/lib/telepathy/contactlist/conn.c
+++ b/tests/lib/telepathy/contactlist/conn.c
@@ -27,8 +27,8 @@
static void init_aliasing (gpointer, gpointer);
static void init_contact_info (gpointer, gpointer);
-G_DEFINE_TYPE_WITH_CODE (TpTestContactListConnection,
- tp_test_contact_list_connection,
+G_DEFINE_TYPE_WITH_CODE (TpTestsContactListConnection,
+ tp_tests_contact_list_connection,
TP_TYPE_BASE_CONNECTION,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
init_aliasing);
@@ -51,11 +51,11 @@ enum
N_PROPS
};
-struct _TpTestContactListConnectionPrivate
+struct _TpTestsContactListConnectionPrivate
{
gchar *account;
guint simulation_delay;
- TpTestContactListManager *list_manager;
+ TpTestsContactListManager *list_manager;
gboolean away;
TpChannelGroupFlags publish_flags;
TpChannelGroupFlags subscribe_flags;
@@ -67,11 +67,11 @@ static TpChannelGroupFlags default_group_flags =
TP_CHANNEL_GROUP_FLAG_MEMBERS_CHANGED_DETAILED;
static void
-tp_test_contact_list_connection_init (TpTestContactListConnection *self)
+tp_tests_contact_list_connection_init (TpTestsContactListConnection *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- TP_TEST_TYPE_CONTACT_LIST_CONNECTION,
- TpTestContactListConnectionPrivate);
+ TP_TESTS_TYPE_CONTACT_LIST_CONNECTION,
+ TpTestsContactListConnectionPrivate);
}
static void
@@ -80,8 +80,8 @@ get_property (GObject *object,
GValue *value,
GParamSpec *spec)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
switch (property_id)
{
@@ -116,8 +116,8 @@ set_property (GObject *object,
const GValue *value,
GParamSpec *spec)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
switch (property_id)
{
@@ -146,26 +146,26 @@ set_property (GObject *object,
static void
finalize (GObject *object)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
tp_contacts_mixin_finalize (object);
g_free (self->priv->account);
- G_OBJECT_CLASS (tp_test_contact_list_connection_parent_class)->finalize (
+ G_OBJECT_CLASS (tp_tests_contact_list_connection_parent_class)->finalize (
object);
}
/**
- * tp_test_contact_list_connection_get_manager:
+ * tp_tests_contact_list_connection_get_manager:
* @self: the connection
*
* Returns: (transfer none): the contact list manager or %NULL.
*/
-TpTestContactListManager *
-tp_test_contact_list_connection_get_manager (TpTestContactListConnection *self)
+TpTestsContactListManager *
+tp_tests_contact_list_connection_get_manager (TpTestsContactListConnection *self)
{
- g_return_val_if_fail (TP_TEST_IS_CONTACT_LIST_CONNECTION (self), NULL);
+ g_return_val_if_fail (TP_TESTS_IS_CONTACT_LIST_CONNECTION (self), NULL);
return self->priv->list_manager;
}
@@ -173,13 +173,13 @@ tp_test_contact_list_connection_get_manager (TpTestContactListConnection *self)
static gchar *
get_unique_connection_name (TpBaseConnection *conn)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (conn);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (conn);
return g_strdup_printf ("%s %p", self->priv->account, self);
}
gchar *
-tp_test_contact_list_normalize_contact (TpHandleRepoIface *repo,
+tp_tests_contact_list_normalize_contact (TpHandleRepoIface *repo,
const gchar *id,
gpointer context,
GError **error)
@@ -195,7 +195,7 @@ tp_test_contact_list_normalize_contact (TpHandleRepoIface *repo,
}
static gchar *
-tp_test_contact_list_normalize_group (TpHandleRepoIface *repo,
+tp_tests_contact_list_normalize_group (TpHandleRepoIface *repo,
const gchar *id,
gpointer context,
GError **error)
@@ -215,19 +215,19 @@ create_handle_repos (TpBaseConnection *conn,
TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
{
repos[TP_HANDLE_TYPE_CONTACT] = tp_dynamic_handle_repo_new
- (TP_HANDLE_TYPE_CONTACT, tp_test_contact_list_normalize_contact, NULL);
+ (TP_HANDLE_TYPE_CONTACT, tp_tests_contact_list_normalize_contact, NULL);
repos[TP_HANDLE_TYPE_LIST] = tp_static_handle_repo_new
- (TP_HANDLE_TYPE_LIST, tp_test_contact_lists ());
+ (TP_HANDLE_TYPE_LIST, tp_tests_contact_lists ());
repos[TP_HANDLE_TYPE_GROUP] = tp_dynamic_handle_repo_new
- (TP_HANDLE_TYPE_GROUP, tp_test_contact_list_normalize_group, NULL);
+ (TP_HANDLE_TYPE_GROUP, tp_tests_contact_list_normalize_group, NULL);
}
static void
-alias_updated_cb (TpTestContactListManager *manager,
+alias_updated_cb (TpTestsContactListManager *manager,
TpHandle contact,
- TpTestContactListConnection *self)
+ TpTestsContactListConnection *self)
{
GPtrArray *aliases;
GValueArray *pair;
@@ -239,7 +239,7 @@ alias_updated_cb (TpTestContactListManager *manager,
g_value_init (pair->values + 1, G_TYPE_STRING);
g_value_set_uint (pair->values + 0, contact);
g_value_set_string (pair->values + 1,
- tp_test_contact_list_manager_get_alias (manager, contact));
+ tp_tests_contact_list_manager_get_alias (manager, contact));
aliases = g_ptr_array_sized_new (1);
g_ptr_array_add (aliases, pair);
@@ -251,11 +251,11 @@ alias_updated_cb (TpTestContactListManager *manager,
}
static void
-contact_info_updated_cb (TpTestContactListManager *manager,
+contact_info_updated_cb (TpTestsContactListManager *manager,
TpHandle contact,
- TpTestContactListConnection *self)
+ TpTestsContactListConnection *self)
{
- GPtrArray *contact_info = tp_test_contact_list_manager_get_contact_info (
+ GPtrArray *contact_info = tp_tests_contact_list_manager_get_contact_info (
self->priv->list_manager, contact);
if (contact_info != NULL)
@@ -266,9 +266,9 @@ contact_info_updated_cb (TpTestContactListManager *manager,
}
static void
-presence_updated_cb (TpTestContactListManager *manager,
+presence_updated_cb (TpTestsContactListManager *manager,
TpHandle contact,
- TpTestContactListConnection *self)
+ TpTestsContactListConnection *self)
{
TpBaseConnection *base = (TpBaseConnection *) self;
TpPresenceStatus *status;
@@ -278,7 +278,7 @@ presence_updated_cb (TpTestContactListManager *manager,
return;
status = tp_presence_status_new (
- tp_test_contact_list_manager_get_presence (manager, contact),
+ tp_tests_contact_list_manager_get_presence (manager, contact),
NULL);
tp_presence_mixin_emit_one_presence_update ((GObject *) self,
contact, status);
@@ -288,13 +288,13 @@ presence_updated_cb (TpTestContactListManager *manager,
static GPtrArray *
create_channel_managers (TpBaseConnection *conn)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (conn);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (conn);
GPtrArray *ret = g_ptr_array_sized_new (1);
self->priv->list_manager =
- TP_TEST_CONTACT_LIST_MANAGER (g_object_new (
- TP_TEST_TYPE_CONTACT_LIST_MANAGER,
+ TP_TESTS_CONTACT_LIST_MANAGER (g_object_new (
+ TP_TESTS_TYPE_CONTACT_LIST_MANAGER,
"connection", conn,
"simulation-delay", self->priv->simulation_delay,
NULL));
@@ -315,7 +315,7 @@ static gboolean
start_connecting (TpBaseConnection *conn,
GError **error)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (conn);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (conn);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
@@ -349,8 +349,8 @@ aliasing_fill_contact_attributes (GObject *object,
const GArray *contacts,
GHashTable *attributes)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
guint i;
for (i = 0; i < contacts->len; i++)
@@ -360,7 +360,7 @@ aliasing_fill_contact_attributes (GObject *object,
tp_contacts_mixin_set_contact_attribute (attributes, contact,
TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS,
tp_g_value_slice_new_string (
- tp_test_contact_list_manager_get_alias (self->priv->list_manager,
+ tp_tests_contact_list_manager_get_alias (self->priv->list_manager,
contact)));
}
}
@@ -370,13 +370,13 @@ contact_info_fill_contact_attributes (GObject *object,
const GArray *contacts,
GHashTable *attributes_hash)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (object);
guint i;
for (i = 0; i < contacts->len; i++)
{
TpHandle contact = g_array_index (contacts, TpHandle, i);
- GPtrArray *contact_info = tp_test_contact_list_manager_get_contact_info (
+ GPtrArray *contact_info = tp_tests_contact_list_manager_get_contact_info (
self->priv->list_manager, contact);
if (contact_info != NULL)
{
@@ -461,13 +461,13 @@ constructed (GObject *object)
{
TpBaseConnection *base = TP_BASE_CONNECTION (object);
void (*chain_up) (GObject *) =
- G_OBJECT_CLASS (tp_test_contact_list_connection_parent_class)->constructed;
+ G_OBJECT_CLASS (tp_tests_contact_list_connection_parent_class)->constructed;
if (chain_up != NULL)
chain_up (object);
tp_contacts_mixin_init (object,
- G_STRUCT_OFFSET (TpTestContactListConnection, contacts_mixin));
+ G_STRUCT_OFFSET (TpTestsContactListConnection, contacts_mixin));
tp_base_connection_register_with_contacts_mixin (base);
tp_contacts_mixin_add_contact_attributes_iface (object,
TP_IFACE_CONNECTION_INTERFACE_ALIASING,
@@ -477,7 +477,7 @@ constructed (GObject *object)
contact_info_fill_contact_attributes);
tp_presence_mixin_init (object,
- G_STRUCT_OFFSET (TpTestContactListConnection, presence_mixin));
+ G_STRUCT_OFFSET (TpTestsContactListConnection, presence_mixin));
tp_presence_mixin_simple_presence_register_with_contacts_mixin (object);
}
@@ -498,8 +498,8 @@ get_contact_statuses (GObject *object,
const GArray *contacts,
GError **error)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
TpBaseConnection *base = TP_BASE_CONNECTION (object);
guint i;
GHashTable *result = g_hash_table_new_full (g_direct_hash, g_direct_equal,
@@ -508,19 +508,19 @@ get_contact_statuses (GObject *object,
for (i = 0; i < contacts->len; i++)
{
TpHandle contact = g_array_index (contacts, guint, i);
- TpTestContactListPresence presence;
+ TpTestsContactListPresence presence;
GHashTable *parameters;
/* we get our own status from the connection, and everyone else's status
* from the contact lists */
if (contact == base->self_handle)
{
- presence = (self->priv->away ? TP_TEST_CONTACT_LIST_PRESENCE_AWAY
- : TP_TEST_CONTACT_LIST_PRESENCE_AVAILABLE);
+ presence = (self->priv->away ? TP_TESTS_CONTACT_LIST_PRESENCE_AWAY
+ : TP_TESTS_CONTACT_LIST_PRESENCE_AVAILABLE);
}
else
{
- presence = tp_test_contact_list_manager_get_presence (
+ presence = tp_tests_contact_list_manager_get_presence (
self->priv->list_manager, contact);
}
@@ -539,12 +539,12 @@ set_own_status (GObject *object,
const TpPresenceStatus *status,
GError **error)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (object);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (object);
TpBaseConnection *base = TP_BASE_CONNECTION (object);
GHashTable *presences;
- if (status->index == TP_TEST_CONTACT_LIST_PRESENCE_AWAY)
+ if (status->index == TP_TESTS_CONTACT_LIST_PRESENCE_AWAY)
{
if (self->priv->away)
return TRUE;
@@ -569,8 +569,8 @@ set_own_status (GObject *object,
}
static void
-tp_test_contact_list_connection_class_init (
- TpTestContactListConnectionClass *klass)
+tp_tests_contact_list_connection_class_init (
+ TpTestsContactListConnectionClass *klass)
{
static const gchar *interfaces_always_present[] = {
TP_IFACE_CONNECTION_INTERFACE_ALIASING,
@@ -598,7 +598,7 @@ tp_test_contact_list_connection_class_init (
object_class->constructed = constructed;
object_class->finalize = finalize;
g_type_class_add_private (klass,
- sizeof (TpTestContactListConnectionPrivate));
+ sizeof (TpTestsContactListConnectionPrivate));
base_class->create_handle_repos = create_handle_repos;
base_class->get_unique_connection_name = get_unique_connection_name;
@@ -613,9 +613,9 @@ tp_test_contact_list_connection_class_init (
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
g_object_class_install_property (object_class, PROP_ACCOUNT, param_spec);
- param_spec = g_param_spec_object ("manager", "TpTestContactListManager",
- "TpTestContactListManager object that owns this channel",
- TP_TEST_TYPE_CONTACT_LIST_MANAGER,
+ param_spec = g_param_spec_object ("manager", "TpTestsContactListManager",
+ "TpTestsContactListManager object that owns this channel",
+ TP_TESTS_TYPE_CONTACT_LIST_MANAGER,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_MANAGER, param_spec);
@@ -641,16 +641,16 @@ tp_test_contact_list_connection_class_init (
param_spec);
tp_contacts_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListConnectionClass, contacts_mixin));
+ G_STRUCT_OFFSET (TpTestsContactListConnectionClass, contacts_mixin));
tp_presence_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListConnectionClass, presence_mixin),
+ G_STRUCT_OFFSET (TpTestsContactListConnectionClass, presence_mixin),
status_available, get_contact_statuses, set_own_status,
- tp_test_contact_list_presence_statuses ());
+ tp_tests_contact_list_presence_statuses ());
tp_presence_mixin_simple_presence_init_dbus_properties (object_class);
klass->properties_class.interfaces = prop_interfaces;
tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListConnectionClass, properties_class));
+ G_STRUCT_OFFSET (TpTestsContactListConnectionClass, properties_class));
}
static void
@@ -669,8 +669,8 @@ get_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
const GArray *contacts,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (aliasing);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (aliasing);
TpBaseConnection *base = TP_BASE_CONNECTION (aliasing);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -692,7 +692,7 @@ get_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
for (i = 0; i < contacts->len; i++)
{
TpHandle contact = g_array_index (contacts, TpHandle, i);
- const gchar *alias = tp_test_contact_list_manager_get_alias (
+ const gchar *alias = tp_tests_contact_list_manager_get_alias (
self->priv->list_manager, contact);
g_hash_table_insert (result, GUINT_TO_POINTER (contact),
@@ -709,8 +709,8 @@ request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
const GArray *contacts,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (aliasing);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (aliasing);
TpBaseConnection *base = TP_BASE_CONNECTION (aliasing);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -733,7 +733,7 @@ request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
for (i = 0; i < contacts->len; i++)
{
TpHandle contact = g_array_index (contacts, TpHandle, i);
- const gchar *alias = tp_test_contact_list_manager_get_alias (
+ const gchar *alias = tp_tests_contact_list_manager_get_alias (
self->priv->list_manager, contact);
g_ptr_array_add (result, (gchar *) alias);
@@ -751,8 +751,8 @@ set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
GHashTable *aliases,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self =
- TP_TEST_CONTACT_LIST_CONNECTION (aliasing);
+ TpTestsContactListConnection *self =
+ TP_TESTS_CONTACT_LIST_CONNECTION (aliasing);
TpBaseConnection *base = TP_BASE_CONNECTION (aliasing);
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -778,7 +778,7 @@ set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
while (g_hash_table_iter_next (&iter, &key, &value))
{
- tp_test_contact_list_manager_set_alias (self->priv->list_manager,
+ tp_tests_contact_list_manager_set_alias (self->priv->list_manager,
GPOINTER_TO_UINT (key), value);
}
@@ -806,7 +806,7 @@ get_contact_info (
const GArray *contacts,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (iface);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (iface);
TpBaseConnection *base = (TpBaseConnection *) self;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -829,7 +829,7 @@ get_contact_info (
for (i = 0; i < contacts->len; i++)
{
TpHandle contact = g_array_index (contacts, TpHandle, i);
- GPtrArray *contact_info = tp_test_contact_list_manager_get_contact_info (
+ GPtrArray *contact_info = tp_tests_contact_list_manager_get_contact_info (
self->priv->list_manager, contact);
if (contact_info != NULL)
{
@@ -850,7 +850,7 @@ refresh_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
const GArray *contacts,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (iface);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (iface);
guint i;
for (i = 0; i < contacts->len; i++)
@@ -858,7 +858,7 @@ refresh_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
TpHandle contact = g_array_index (contacts, TpHandle, i);
GPtrArray *contact_info;
- contact_info = tp_test_contact_list_manager_get_contact_info (
+ contact_info = tp_tests_contact_list_manager_get_contact_info (
self->priv->list_manager, contact);
if (contact_info != NULL)
@@ -870,14 +870,14 @@ refresh_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
}
static void
-_return_from_request_contact_info (TpTestContactListConnection *self,
+_return_from_request_contact_info (TpTestsContactListConnection *self,
guint contact,
DBusGMethodInvocation *context)
{
GError *error = NULL;
GPtrArray *contact_info;
- contact_info = tp_test_contact_list_manager_get_contact_info (
+ contact_info = tp_tests_contact_list_manager_get_contact_info (
self->priv->list_manager, contact);
if (contact_info == NULL)
@@ -896,7 +896,7 @@ request_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
guint contact,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (iface);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (iface);
TpBaseConnection *base = (TpBaseConnection *) self;
TpHandleRepoIface *contact_handles = tp_base_connection_get_handles (base,
TP_HANDLE_TYPE_CONTACT);
@@ -919,7 +919,7 @@ set_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
const GPtrArray *contact_info,
DBusGMethodInvocation *context)
{
- TpTestContactListConnection *self = TP_TEST_CONTACT_LIST_CONNECTION (iface);
+ TpTestsContactListConnection *self = TP_TESTS_CONTACT_LIST_CONNECTION (iface);
GError *error = NULL;
if (contact_info == NULL)
@@ -929,7 +929,7 @@ set_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
return;
}
- tp_test_contact_list_manager_set_contact_info (self->priv->list_manager,
+ tp_tests_contact_list_manager_set_contact_info (self->priv->list_manager,
contact_info);
tp_svc_connection_interface_contact_info_return_from_set_contact_info (
@@ -951,8 +951,8 @@ init_contact_info (gpointer iface,
#undef IMPLEMENT
}
-TpTestContactListConnection *
-tp_test_contact_list_connection_new (const gchar *account,
+TpTestsContactListConnection *
+tp_tests_contact_list_connection_new (const gchar *account,
const gchar *protocol,
TpChannelGroupFlags publish_flags,
TpChannelGroupFlags subscribe_flags)
@@ -963,7 +963,7 @@ tp_test_contact_list_connection_new (const gchar *account,
if (subscribe_flags == 0)
subscribe_flags = default_group_flags;
- return g_object_new (TP_TEST_TYPE_CONTACT_LIST_CONNECTION,
+ return g_object_new (TP_TESTS_TYPE_CONTACT_LIST_CONNECTION,
"account", account,
"protocol", protocol,
"publish-flags", publish_flags,
diff --git a/tests/lib/telepathy/contactlist/conn.h b/tests/lib/telepathy/contactlist/conn.h
index e606603..cbb6451 100644
--- a/tests/lib/telepathy/contactlist/conn.h
+++ b/tests/lib/telepathy/contactlist/conn.h
@@ -9,8 +9,8 @@
* notice and this notice are preserved.
*/
-#ifndef __TP_TEST_CONTACT_LIST_CONN_H__
-#define __TP_TEST_CONTACT_LIST_CONN_H__
+#ifndef __TP_TESTS_CONTACT_LIST_CONN_H__
+#define __TP_TESTS_CONTACT_LIST_CONN_H__
#include <glib-object.h>
#include <telepathy-glib/base-connection.h>
@@ -21,52 +21,52 @@
G_BEGIN_DECLS
-typedef struct _TpTestContactListConnection TpTestContactListConnection;
-typedef struct _TpTestContactListConnectionClass
- TpTestContactListConnectionClass;
-typedef struct _TpTestContactListConnectionPrivate
- TpTestContactListConnectionPrivate;
+typedef struct _TpTestsContactListConnection TpTestsContactListConnection;
+typedef struct _TpTestsContactListConnectionClass
+ TpTestsContactListConnectionClass;
+typedef struct _TpTestsContactListConnectionPrivate
+ TpTestsContactListConnectionPrivate;
-struct _TpTestContactListConnectionClass {
+struct _TpTestsContactListConnectionClass {
TpBaseConnectionClass parent_class;
TpDBusPropertiesMixinClass properties_class;
TpPresenceMixinClass presence_mixin;
TpContactsMixinClass contacts_mixin;
};
-struct _TpTestContactListConnection {
+struct _TpTestsContactListConnection {
TpBaseConnection parent;
TpPresenceMixin presence_mixin;
TpContactsMixin contacts_mixin;
- TpTestContactListConnectionPrivate *priv;
+ TpTestsContactListConnectionPrivate *priv;
};
-GType tp_test_contact_list_connection_get_type (void);
+GType tp_tests_contact_list_connection_get_type (void);
-#define TP_TEST_TYPE_CONTACT_LIST_CONNECTION \
- (tp_test_contact_list_connection_get_type ())
-#define TP_TEST_CONTACT_LIST_CONNECTION(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TEST_TYPE_CONTACT_LIST_CONNECTION, \
- TpTestContactListConnection))
-#define TP_TEST_CONTACT_LIST_CONNECTION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TEST_TYPE_CONTACT_LIST_CONNECTION, \
- TpTestContactListConnectionClass))
-#define TP_TEST_IS_CONTACT_LIST_CONNECTION(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TEST_TYPE_CONTACT_LIST_CONNECTION))
-#define TP_TEST_IS_CONTACT_LIST_CONNECTION_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TEST_TYPE_CONTACT_LIST_CONNECTION))
-#define TP_TEST_CONTACT_LIST_CONNECTION_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_CONTACT_LIST_CONNECTION, \
- TpTestContactListConnectionClass))
+#define TP_TESTS_TYPE_CONTACT_LIST_CONNECTION \
+ (tp_tests_contact_list_connection_get_type ())
+#define TP_TESTS_CONTACT_LIST_CONNECTION(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TESTS_TYPE_CONTACT_LIST_CONNECTION, \
+ TpTestsContactListConnection))
+#define TP_TESTS_CONTACT_LIST_CONNECTION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), TP_TESTS_TYPE_CONTACT_LIST_CONNECTION, \
+ TpTestsContactListConnectionClass))
+#define TP_TESTS_IS_CONTACT_LIST_CONNECTION(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TESTS_TYPE_CONTACT_LIST_CONNECTION))
+#define TP_TESTS_IS_CONTACT_LIST_CONNECTION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TESTS_TYPE_CONTACT_LIST_CONNECTION))
+#define TP_TESTS_CONTACT_LIST_CONNECTION_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_CONTACT_LIST_CONNECTION, \
+ TpTestsContactListConnectionClass))
-TpTestContactListManager *tp_test_contact_list_connection_get_manager (
- TpTestContactListConnection *self);
+TpTestsContactListManager *tp_tests_contact_list_connection_get_manager (
+ TpTestsContactListConnection *self);
-gchar *tp_test_contact_list_normalize_contact (TpHandleRepoIface *repo,
+gchar *tp_tests_contact_list_normalize_contact (TpHandleRepoIface *repo,
const gchar *id, gpointer context, GError **error);
-TpTestContactListConnection *tp_test_contact_list_connection_new (
+TpTestsContactListConnection *tp_tests_contact_list_connection_new (
const gchar *account, const gchar *protocol,
TpChannelGroupFlags publish_flags, TpChannelGroupFlags subscribe_flags);
diff --git a/tests/lib/telepathy/contactlist/contact-list-manager.c b/tests/lib/telepathy/contactlist/contact-list-manager.c
index 6d08f67..b8f19e8 100644
--- a/tests/lib/telepathy/contactlist/contact-list-manager.c
+++ b/tests/lib/telepathy/contactlist/contact-list-manager.c
@@ -22,8 +22,8 @@
#include "contact-list.h"
/* elements 0, 1... of this array must be kept in sync with elements 1, 2...
- * of the enum TpTestContactList in contact-list-manager.h */
-static const gchar *_contact_lists[NUM_TP_TEST_CONTACT_LISTS + 1] = {
+ * of the enum TpTestsContactList in contact-list-manager.h */
+static const gchar *_contact_lists[NUM_TP_TESTS_CONTACT_LISTS + 1] = {
"subscribe",
"publish",
"stored",
@@ -31,13 +31,13 @@ static const gchar *_contact_lists[NUM_TP_TEST_CONTACT_LISTS + 1] = {
};
const gchar **
-tp_test_contact_lists (void)
+tp_tests_contact_lists (void)
{
return _contact_lists;
}
/* this array must be kept in sync with the enum
- * TpTestContactListPresence in contact-list-manager.h */
+ * TpTestsContactListPresence in contact-list-manager.h */
static const TpPresenceStatusSpec _statuses[] = {
{ "offline", TP_CONNECTION_PRESENCE_TYPE_OFFLINE, FALSE, NULL },
{ "unknown", TP_CONNECTION_PRESENCE_TYPE_UNKNOWN, FALSE, NULL },
@@ -48,7 +48,7 @@ static const TpPresenceStatusSpec _statuses[] = {
};
const TpPresenceStatusSpec *
-tp_test_contact_list_presence_statuses (void)
+tp_tests_contact_list_presence_statuses (void)
{
return _statuses;
}
@@ -65,18 +65,18 @@ typedef struct {
TpHandleSet *tags;
GPtrArray *contact_info;
-} TpTestContactDetails;
+} TpTestsContactDetails;
-static TpTestContactDetails *
-tp_test_contact_details_new (void)
+static TpTestsContactDetails *
+tp_tests_contact_details_new (void)
{
- return g_slice_new0 (TpTestContactDetails);
+ return g_slice_new0 (TpTestsContactDetails);
}
static void
-tp_test_contact_details_destroy (gpointer p)
+tp_tests_contact_details_destroy (gpointer p)
{
- TpTestContactDetails *d = p;
+ TpTestsContactDetails *d = p;
if (d->tags != NULL)
tp_handle_set_destroy (d->tags);
@@ -86,13 +86,13 @@ tp_test_contact_details_destroy (gpointer p)
g_free (d->id);
g_free (d->alias);
- g_slice_free (TpTestContactDetails, d);
+ g_slice_free (TpTestsContactDetails, d);
}
static void channel_manager_iface_init (gpointer, gpointer);
-G_DEFINE_TYPE_WITH_CODE (TpTestContactListManager,
- tp_test_contact_list_manager,
+G_DEFINE_TYPE_WITH_CODE (TpTestsContactListManager,
+ tp_tests_contact_list_manager,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_MANAGER,
channel_manager_iface_init))
@@ -114,7 +114,7 @@ enum
N_PROPS
};
-struct _TpTestContactListManagerPrivate
+struct _TpTestsContactListManagerPrivate
{
TpBaseConnection *conn;
guint simulation_delay;
@@ -123,12 +123,12 @@ struct _TpTestContactListManagerPrivate
TpHandleSet *contacts;
/* GUINT_TO_POINTER (handle borrowed from contacts)
- * => TpTestContactDetails */
+ * => TpTestsContactDetails */
GHashTable *contact_details;
- TpTestContactList *lists[NUM_TP_TEST_CONTACT_LISTS];
+ TpTestsContactList *lists[NUM_TP_TESTS_CONTACT_LISTS];
- /* GUINT_TO_POINTER (handle borrowed from channel) => TpTestContactGroup */
+ /* GUINT_TO_POINTER (handle borrowed from channel) => TpTestsContactGroup */
GHashTable *groups;
/* borrowed TpExportableChannel => GSList of gpointer (request tokens) that
@@ -140,13 +140,13 @@ struct _TpTestContactListManagerPrivate
};
static void
-tp_test_contact_list_manager_init (TpTestContactListManager *self)
+tp_tests_contact_list_manager_init (TpTestsContactListManager *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- TP_TEST_TYPE_CONTACT_LIST_MANAGER, TpTestContactListManagerPrivate);
+ TP_TESTS_TYPE_CONTACT_LIST_MANAGER, TpTestsContactListManagerPrivate);
self->priv->contact_details = g_hash_table_new_full (g_direct_hash,
- g_direct_equal, NULL, tp_test_contact_details_destroy);
+ g_direct_equal, NULL, tp_tests_contact_details_destroy);
self->priv->groups = g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL, g_object_unref);
self->priv->queued_requests = g_hash_table_new_full (g_direct_hash,
@@ -159,7 +159,7 @@ tp_test_contact_list_manager_init (TpTestContactListManager *self)
}
static void
-tp_test_contact_list_manager_close_all (TpTestContactListManager *self)
+tp_tests_contact_list_manager_close_all (TpTestsContactListManager *self)
{
guint i;
@@ -215,11 +215,11 @@ tp_test_contact_list_manager_close_all (TpTestContactListManager *self)
g_hash_table_destroy (tmp);
}
- for (i = 0; i < NUM_TP_TEST_CONTACT_LISTS; i++)
+ for (i = 0; i < NUM_TP_TESTS_CONTACT_LISTS; i++)
{
if (self->priv->lists[i] != NULL)
{
- TpTestContactList *list = self->priv->lists[i];
+ TpTestsContactList *list = self->priv->lists[i];
/* set self->priv->lists[i] to NULL here so list_closed_cb does
* not try to delete the list again */
@@ -239,14 +239,14 @@ tp_test_contact_list_manager_close_all (TpTestContactListManager *self)
static void
dispose (GObject *object)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (object);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (object);
- tp_test_contact_list_manager_close_all (self);
+ tp_tests_contact_list_manager_close_all (self);
g_assert (self->priv->groups == NULL);
g_assert (self->priv->lists[0] == NULL);
g_assert (self->priv->queued_requests == NULL);
- ((GObjectClass *) tp_test_contact_list_manager_parent_class)->dispose (
+ ((GObjectClass *) tp_tests_contact_list_manager_parent_class)->dispose (
object);
}
@@ -256,7 +256,7 @@ get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (object);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (object);
switch (property_id)
{
@@ -279,7 +279,7 @@ set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (object);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (object);
switch (property_id)
{
@@ -303,7 +303,7 @@ static void
satisfy_queued_requests (TpExportableChannel *channel,
gpointer user_data)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (user_data);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (user_data);
GSList *requests = g_hash_table_lookup (self->priv->queued_requests,
channel);
@@ -314,26 +314,26 @@ satisfy_queued_requests (TpExportableChannel *channel,
g_slist_free (requests);
}
-static TpTestContactDetails *
-lookup_contact (TpTestContactListManager *self,
+static TpTestsContactDetails *
+lookup_contact (TpTestsContactListManager *self,
TpHandle contact)
{
return g_hash_table_lookup (self->priv->contact_details,
GUINT_TO_POINTER (contact));
}
-static TpTestContactDetails *
-ensure_contact (TpTestContactListManager *self,
+static TpTestsContactDetails *
+ensure_contact (TpTestsContactListManager *self,
TpHandle contact,
gboolean *created)
{
- TpTestContactDetails *ret = lookup_contact (self, contact);
+ TpTestsContactDetails *ret = lookup_contact (self, contact);
if (ret == NULL)
{
tp_handle_set_add (self->priv->contacts, contact);
- ret = tp_test_contact_details_new ();
+ ret = tp_tests_contact_details_new ();
ret->alias = g_strdup (tp_handle_inspect (self->priv->contact_repo,
contact));
@@ -352,16 +352,16 @@ ensure_contact (TpTestContactListManager *self,
}
static void
-tp_test_contact_list_manager_foreach_channel (TpChannelManager *manager,
+tp_tests_contact_list_manager_foreach_channel (TpChannelManager *manager,
TpExportableChannelFunc callback,
gpointer user_data)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (manager);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (manager);
GHashTableIter iter;
gpointer handle, channel;
guint i;
- for (i = 0; i < NUM_TP_TEST_CONTACT_LISTS; i++)
+ for (i = 0; i < NUM_TP_TESTS_CONTACT_LISTS; i++)
{
if (self->priv->lists[i] != NULL)
callback (TP_EXPORTABLE_CHANNEL (self->priv->lists[i]), user_data);
@@ -375,11 +375,11 @@ tp_test_contact_list_manager_foreach_channel (TpChannelManager *manager,
}
}
-static TpTestContactGroup *ensure_group (TpTestContactListManager *self,
+static TpTestsContactGroup *ensure_group (TpTestsContactListManager *self,
TpHandle handle);
-static TpTestContactList *ensure_list (TpTestContactListManager *self,
- TpTestContactListHandle handle);
+static TpTestsContactList *ensure_list (TpTestsContactListManager *self,
+ TpTestsContactListHandle handle);
/*
* _insert_contact_field:
@@ -416,14 +416,14 @@ _insert_contact_field (GPtrArray *contact_info,
static gboolean
receive_contact_lists (gpointer p)
{
- TpTestContactListManager *self = p;
+ TpTestsContactListManager *self = p;
TpHandle handle, cambridge, montreal, francophones;
const gchar *id;
- TpTestContactDetails *d;
+ TpTestsContactDetails *d;
TpIntSet *set, *cam_set, *mtl_set, *fr_set;
TpIntSetFastIter iter;
- TpTestContactList *subscribe, *publish, *stored;
- TpTestContactGroup *cambridge_group, *montreal_group,
+ TpTestsContactList *subscribe, *publish, *stored;
+ TpTestsContactGroup *cambridge_group, *montreal_group,
*francophones_group;
if (self->priv->groups == NULL)
@@ -436,9 +436,9 @@ receive_contact_lists (gpointer p)
/* In a real CM we'd have received a contact list from the server at this
* point. But this isn't a real CM, so we have to make one up... */
- subscribe = ensure_list (self, TP_TEST_CONTACT_LIST_SUBSCRIBE);
- publish = ensure_list (self, TP_TEST_CONTACT_LIST_PUBLISH);
- stored = ensure_list (self, TP_TEST_CONTACT_LIST_STORED);
+ subscribe = ensure_list (self, TP_TESTS_CONTACT_LIST_SUBSCRIBE);
+ publish = ensure_list (self, TP_TESTS_CONTACT_LIST_PUBLISH);
+ stored = ensure_list (self, TP_TESTS_CONTACT_LIST_STORED);
cambridge = tp_handle_ensure (self->priv->group_repo, "Cambridge", NULL,
NULL);
@@ -696,7 +696,7 @@ receive_contact_lists (gpointer p)
/* Now we've received the roster, we can satisfy all the queued requests */
- tp_test_contact_list_manager_foreach_channel ((TpChannelManager *) self,
+ tp_tests_contact_list_manager_foreach_channel ((TpChannelManager *) self,
satisfy_queued_requests, self);
g_assert (g_hash_table_size (self->priv->queued_requests) == 0);
@@ -710,7 +710,7 @@ static void
status_changed_cb (TpBaseConnection *conn,
guint status,
guint reason,
- TpTestContactListManager *self)
+ TpTestsContactListManager *self)
{
switch (status)
{
@@ -731,7 +731,7 @@ status_changed_cb (TpBaseConnection *conn,
case TP_CONNECTION_STATUS_DISCONNECTED:
{
- tp_test_contact_list_manager_close_all (self);
+ tp_tests_contact_list_manager_close_all (self);
}
break;
default:
@@ -742,9 +742,9 @@ status_changed_cb (TpBaseConnection *conn,
static void
constructed (GObject *object)
{
- TpTestContactListManager *self = TP_TEST_CONTACT_LIST_MANAGER (object);
+ TpTestsContactListManager *self = TP_TESTS_CONTACT_LIST_MANAGER (object);
void (*chain_up) (GObject *) =
- ((GObjectClass *) tp_test_contact_list_manager_parent_class)->constructed;
+ ((GObjectClass *) tp_tests_contact_list_manager_parent_class)->constructed;
if (chain_up != NULL)
{
@@ -762,7 +762,7 @@ constructed (GObject *object)
}
static void
-tp_test_contact_list_manager_class_init (TpTestContactListManagerClass *klass)
+tp_tests_contact_list_manager_class_init (TpTestsContactListManagerClass *klass)
{
GParamSpec *param_spec;
GObjectClass *object_class = (GObjectClass *) klass;
@@ -786,7 +786,7 @@ tp_test_contact_list_manager_class_init (TpTestContactListManagerClass *klass)
g_object_class_install_property (object_class, PROP_SIMULATION_DELAY,
param_spec);
- g_type_class_add_private (klass, sizeof (TpTestContactListManagerPrivate));
+ g_type_class_add_private (klass, sizeof (TpTestsContactListManagerPrivate));
signals[ALIAS_UPDATED] = g_signal_new ("alias-updated",
G_TYPE_FROM_CLASS (klass),
@@ -811,8 +811,8 @@ tp_test_contact_list_manager_class_init (TpTestContactListManagerClass *klass)
}
static void
-list_closed_cb (TpTestContactList *chan,
- TpTestContactListManager *self)
+list_closed_cb (TpTestsContactList *chan,
+ TpTestsContactListManager *self)
{
TpHandle handle;
@@ -832,8 +832,8 @@ list_closed_cb (TpTestContactList *chan,
}
static void
-group_closed_cb (TpTestContactGroup *chan,
- TpTestContactListManager *self)
+group_closed_cb (TpTestsContactGroup *chan,
+ TpTestsContactListManager *self)
{
tp_channel_manager_emit_channel_closed_for_object (self,
TP_EXPORTABLE_CHANNEL (chan));
@@ -850,13 +850,13 @@ group_closed_cb (TpTestContactGroup *chan,
}
}
-static TpTestContactListBase *
-new_channel (TpTestContactListManager *self,
+static TpTestsContactListBase *
+new_channel (TpTestsContactListManager *self,
TpHandleType handle_type,
TpHandle handle,
gpointer request_token)
{
- TpTestContactListBase *chan;
+ TpTestsContactListBase *chan;
gchar *object_path;
GType type;
GSList *requests = NULL;
@@ -869,7 +869,7 @@ new_channel (TpTestContactListManager *self,
* those clients. Please read the spec when implementing it :-) */
object_path = g_strdup_printf ("%s/%sContactList",
self->priv->conn->object_path, _contact_lists[handle - 1]);
- type = TP_TEST_TYPE_CONTACT_LIST;
+ type = TP_TESTS_TYPE_CONTACT_LIST;
}
else
{
@@ -882,7 +882,7 @@ new_channel (TpTestContactListManager *self,
g_assert (handle_type == TP_HANDLE_TYPE_GROUP);
object_path = g_strdup_printf ("%s/Group/%s",
self->priv->conn->object_path, id);
- type = TP_TEST_TYPE_CONTACT_GROUP;
+ type = TP_TESTS_TYPE_CONTACT_GROUP;
g_free (id);
}
@@ -901,7 +901,7 @@ new_channel (TpTestContactListManager *self,
{
g_signal_connect (chan, "closed", (GCallback) list_closed_cb, self);
g_assert (self->priv->lists[handle] == NULL);
- self->priv->lists[handle] = TP_TEST_CONTACT_LIST (chan);
+ self->priv->lists[handle] = TP_TESTS_CONTACT_LIST (chan);
}
else
{
@@ -910,7 +910,7 @@ new_channel (TpTestContactListManager *self,
g_assert (g_hash_table_lookup (self->priv->groups,
GUINT_TO_POINTER (handle)) == NULL);
g_hash_table_insert (self->priv->groups, GUINT_TO_POINTER (handle),
- TP_TEST_CONTACT_GROUP (chan));
+ TP_TESTS_CONTACT_GROUP (chan));
}
if (self->priv->queued_requests == NULL)
@@ -934,9 +934,9 @@ new_channel (TpTestContactListManager *self,
return chan;
}
-static TpTestContactList *
-ensure_list (TpTestContactListManager *self,
- TpTestContactListHandle handle)
+static TpTestsContactList *
+ensure_list (TpTestsContactListManager *self,
+ TpTestsContactListHandle handle)
{
if (self->priv->lists[handle] == NULL)
{
@@ -947,16 +947,16 @@ ensure_list (TpTestContactListManager *self,
return self->priv->lists[handle];
}
-static TpTestContactGroup *
-ensure_group (TpTestContactListManager *self,
+static TpTestsContactGroup *
+ensure_group (TpTestsContactListManager *self,
TpHandle handle)
{
- TpTestContactGroup *group = g_hash_table_lookup (self->priv->groups,
+ TpTestsContactGroup *group = g_hash_table_lookup (self->priv->groups,
GUINT_TO_POINTER (handle));
if (group == NULL)
{
- group = TP_TEST_CONTACT_GROUP (new_channel (self, TP_HANDLE_TYPE_GROUP,
+ group = TP_TESTS_CONTACT_GROUP (new_channel (self, TP_HANDLE_TYPE_GROUP,
handle, NULL));
}
@@ -976,7 +976,7 @@ static const gchar * const allowed_properties[] = {
};
static void
-tp_test_contact_list_manager_foreach_channel_class (TpChannelManager *manager,
+tp_tests_contact_list_manager_foreach_channel_class (TpChannelManager *manager,
TpChannelManagerChannelClassFunc func,
gpointer user_data)
{
@@ -996,14 +996,14 @@ tp_test_contact_list_manager_foreach_channel_class (TpChannelManager *manager,
}
static gboolean
-tp_test_contact_list_manager_request (TpTestContactListManager *self,
+tp_tests_contact_list_manager_request (TpTestsContactListManager *self,
gpointer request_token,
GHashTable *request_properties,
gboolean require_new)
{
TpHandleType handle_type;
TpHandle handle;
- TpTestContactListBase *chan;
+ TpTestsContactListBase *chan;
GError *error = NULL;
if (tp_strdiff (tp_asv_get_string (request_properties,
@@ -1035,9 +1035,9 @@ tp_test_contact_list_manager_request (TpTestContactListManager *self,
if (handle_type == TP_HANDLE_TYPE_LIST)
{
/* telepathy-glib has already checked that the handle is valid */
- g_assert (handle < NUM_TP_TEST_CONTACT_LISTS);
+ g_assert (handle < NUM_TP_TESTS_CONTACT_LISTS);
- chan = TP_TEST_CONTACT_LIST_BASE (self->priv->lists[handle]);
+ chan = TP_TESTS_CONTACT_LIST_BASE (self->priv->lists[handle]);
}
else
{
@@ -1072,22 +1072,22 @@ error:
}
static gboolean
-tp_test_contact_list_manager_create_channel (TpChannelManager *manager,
+tp_tests_contact_list_manager_create_channel (TpChannelManager *manager,
gpointer request_token,
GHashTable *request_properties)
{
- return tp_test_contact_list_manager_request (
- TP_TEST_CONTACT_LIST_MANAGER (manager), request_token,
+ return tp_tests_contact_list_manager_request (
+ TP_TESTS_CONTACT_LIST_MANAGER (manager), request_token,
request_properties, TRUE);
}
static gboolean
-tp_test_contact_list_manager_ensure_channel (TpChannelManager *manager,
+tp_tests_contact_list_manager_ensure_channel (TpChannelManager *manager,
gpointer request_token,
GHashTable *request_properties)
{
- return tp_test_contact_list_manager_request (
- TP_TEST_CONTACT_LIST_MANAGER (manager), request_token,
+ return tp_tests_contact_list_manager_request (
+ TP_TESTS_CONTACT_LIST_MANAGER (manager), request_token,
request_properties, FALSE);
}
@@ -1097,20 +1097,20 @@ channel_manager_iface_init (gpointer g_iface,
{
TpChannelManagerIface *iface = g_iface;
- iface->foreach_channel = tp_test_contact_list_manager_foreach_channel;
+ iface->foreach_channel = tp_tests_contact_list_manager_foreach_channel;
iface->foreach_channel_class =
- tp_test_contact_list_manager_foreach_channel_class;
- iface->create_channel = tp_test_contact_list_manager_create_channel;
- iface->ensure_channel = tp_test_contact_list_manager_ensure_channel;
+ tp_tests_contact_list_manager_foreach_channel_class;
+ iface->create_channel = tp_tests_contact_list_manager_create_channel;
+ iface->ensure_channel = tp_tests_contact_list_manager_ensure_channel;
/* In this channel manager, Request has the same semantics as Ensure */
- iface->request_channel = tp_test_contact_list_manager_ensure_channel;
+ iface->request_channel = tp_tests_contact_list_manager_ensure_channel;
}
static void
-send_updated_roster (TpTestContactListManager *self,
+send_updated_roster (TpTestsContactListManager *self,
TpHandle contact)
{
- TpTestContactDetails *d = g_hash_table_lookup (self->priv->contact_details,
+ TpTestsContactDetails *d = g_hash_table_lookup (self->priv->contact_details,
GUINT_TO_POINTER (contact));
const gchar *identifier = tp_handle_inspect (self->priv->contact_repo,
contact);
@@ -1207,7 +1207,7 @@ send_updated_roster (TpTestContactListManager *self,
}
gboolean
-tp_test_contact_list_manager_add_to_group (TpTestContactListManager *self,
+tp_tests_contact_list_manager_add_to_group (TpTestsContactListManager *self,
GObject *channel,
TpHandle group,
TpHandle member,
@@ -1215,9 +1215,9 @@ tp_test_contact_list_manager_add_to_group (TpTestContactListManager *self,
GError **error)
{
gboolean updated;
- TpTestContactDetails *d = ensure_contact (self, member, &updated);
- TpTestContactList *stored = self->priv->lists[
- TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactDetails *d = ensure_contact (self, member, &updated);
+ TpTestsContactList *stored = self->priv->lists[
+ TP_TESTS_CONTACT_LIST_STORED];
if (d->tags == NULL)
d->tags = tp_handle_set_new (self->priv->group_repo);
@@ -1245,15 +1245,15 @@ tp_test_contact_list_manager_add_to_group (TpTestContactListManager *self,
}
gboolean
-tp_test_contact_list_manager_remove_from_group (
- TpTestContactListManager *self,
+tp_tests_contact_list_manager_remove_from_group (
+ TpTestsContactListManager *self,
GObject *channel,
TpHandle group,
TpHandle member,
const gchar *message,
GError **error)
{
- TpTestContactDetails *d = lookup_contact (self, member);
+ TpTestsContactDetails *d = lookup_contact (self, member);
/* If not on the roster or not in any groups, we have nothing to do */
if (d == NULL || d->tags == NULL)
@@ -1273,12 +1273,12 @@ tp_test_contact_list_manager_remove_from_group (
}
typedef struct {
- TpTestContactListManager *self;
+ TpTestsContactListManager *self;
TpHandle contact;
} SelfAndContact;
static SelfAndContact *
-self_and_contact_new (TpTestContactListManager *self,
+self_and_contact_new (TpTestsContactListManager *self,
TpHandle contact)
{
SelfAndContact *ret = g_slice_new0 (SelfAndContact);
@@ -1300,15 +1300,15 @@ self_and_contact_destroy (gpointer p)
}
static void
-receive_auth_request (TpTestContactListManager *self,
+receive_auth_request (TpTestsContactListManager *self,
TpHandle contact)
{
- TpTestContactDetails *d;
+ TpTestsContactDetails *d;
TpIntSet *set;
- TpTestContactList *publish = self->priv->lists[
- TP_TEST_CONTACT_LIST_PUBLISH];
- TpTestContactList *stored = self->priv->lists[
- TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactList *publish = self->priv->lists[
+ TP_TESTS_CONTACT_LIST_PUBLISH];
+ TpTestsContactList *stored = self->priv->lists[
+ TP_TESTS_CONTACT_LIST_STORED];
/* if shutting down, do nothing */
if (publish == NULL)
@@ -1344,12 +1344,12 @@ static gboolean
receive_authorized (gpointer p)
{
SelfAndContact *s = p;
- TpTestContactDetails *d;
+ TpTestsContactDetails *d;
TpIntSet *set;
- TpTestContactList *subscribe = s->self->priv->lists[
- TP_TEST_CONTACT_LIST_SUBSCRIBE];
- TpTestContactList *stored = s->self->priv->lists[
- TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactList *subscribe = s->self->priv->lists[
+ TP_TESTS_CONTACT_LIST_SUBSCRIBE];
+ TpTestsContactList *stored = s->self->priv->lists[
+ TP_TESTS_CONTACT_LIST_STORED];
/* A remote contact has accepted our request to see their presence.
*
@@ -1394,10 +1394,10 @@ static gboolean
receive_unauthorized (gpointer p)
{
SelfAndContact *s = p;
- TpTestContactDetails *d;
+ TpTestsContactDetails *d;
TpIntSet *set;
- TpTestContactList *subscribe = s->self->priv->lists[
- TP_TEST_CONTACT_LIST_SUBSCRIBE];
+ TpTestsContactList *subscribe = s->self->priv->lists[
+ TP_TESTS_CONTACT_LIST_SUBSCRIBE];
/* if shutting down, do nothing */
if (subscribe == NULL)
@@ -1432,23 +1432,23 @@ receive_unauthorized (gpointer p)
}
gboolean
-tp_test_contact_list_manager_add_to_list (TpTestContactListManager *self,
+tp_tests_contact_list_manager_add_to_list (TpTestsContactListManager *self,
GObject *channel,
- TpTestContactListHandle list,
+ TpTestsContactListHandle list,
TpHandle member,
const gchar *message,
GError **error)
{
TpIntSet *set;
- TpTestContactList *stored = self->priv->lists[TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactList *stored = self->priv->lists[TP_TESTS_CONTACT_LIST_STORED];
switch (list)
{
- case TP_TEST_CONTACT_LIST_SUBSCRIBE:
+ case TP_TESTS_CONTACT_LIST_SUBSCRIBE:
/* we would like to see member's presence */
{
gboolean created;
- TpTestContactDetails *d = ensure_contact (self, member, &created);
+ TpTestsContactDetails *d = ensure_contact (self, member, &created);
gchar *message_lc;
/* if they already authorized us, it's a no-op */
@@ -1504,11 +1504,11 @@ tp_test_contact_list_manager_add_to_list (TpTestContactListManager *self,
}
return TRUE;
- case TP_TEST_CONTACT_LIST_PUBLISH:
+ case TP_TESTS_CONTACT_LIST_PUBLISH:
/* We would like member to see our presence. This is meaningless,
* unless they have asked for it. */
{
- TpTestContactDetails *d = lookup_contact (self, member);
+ TpTestsContactDetails *d = lookup_contact (self, member);
if (d == NULL || !d->publish_requested)
{
@@ -1540,7 +1540,7 @@ tp_test_contact_list_manager_add_to_list (TpTestContactListManager *self,
}
return TRUE;
- case TP_TEST_CONTACT_LIST_STORED:
+ case TP_TESTS_CONTACT_LIST_STORED:
/* we would like member to be on the roster */
{
gboolean created;
@@ -1558,7 +1558,7 @@ tp_test_contact_list_manager_add_to_list (TpTestContactListManager *self,
}
return TRUE;
- case INVALID_TP_TEST_CONTACT_LIST:
+ case INVALID_TP_TESTS_CONTACT_LIST:
default:
g_return_val_if_reached (FALSE);
}
@@ -1575,9 +1575,9 @@ auth_request_cb (gpointer p)
}
gboolean
-tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
+tp_tests_contact_list_manager_remove_from_list (TpTestsContactListManager *self,
GObject *channel,
- TpTestContactListHandle list,
+ TpTestsContactListHandle list,
TpHandle member,
const gchar *message,
GError **error)
@@ -1586,11 +1586,11 @@ tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
switch (list)
{
- case TP_TEST_CONTACT_LIST_PUBLISH:
+ case TP_TESTS_CONTACT_LIST_PUBLISH:
/* we would like member not to see our presence any more, or we
* would like to reject a request from them to see our presence */
{
- TpTestContactDetails *d = lookup_contact (self, member);
+ TpTestsContactDetails *d = lookup_contact (self, member);
if (d != NULL)
{
@@ -1638,12 +1638,12 @@ tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
}
return TRUE;
- case TP_TEST_CONTACT_LIST_SUBSCRIBE:
+ case TP_TESTS_CONTACT_LIST_SUBSCRIBE:
/* we would like to avoid receiving member's presence any more,
* or we would like to cancel an outstanding request for their
* presence */
{
- TpTestContactDetails *d = lookup_contact (self, member);
+ TpTestsContactDetails *d = lookup_contact (self, member);
if (d != NULL)
{
@@ -1689,10 +1689,10 @@ tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
}
return TRUE;
- case TP_TEST_CONTACT_LIST_STORED:
+ case TP_TESTS_CONTACT_LIST_STORED:
/* we would like to remove member from the roster altogether */
{
- TpTestContactDetails *d = lookup_contact (self, member);
+ TpTestsContactDetails *d = lookup_contact (self, member);
if (d != NULL)
{
@@ -1706,12 +1706,12 @@ tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
self->priv->conn->self_handle,
TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
tp_group_mixin_change_members (
- (GObject *) self->priv->lists[TP_TEST_CONTACT_LIST_SUBSCRIBE],
+ (GObject *) self->priv->lists[TP_TESTS_CONTACT_LIST_SUBSCRIBE],
"", NULL, set, NULL, NULL,
self->priv->conn->self_handle,
TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
tp_group_mixin_change_members (
- (GObject *) self->priv->lists[TP_TEST_CONTACT_LIST_PUBLISH],
+ (GObject *) self->priv->lists[TP_TESTS_CONTACT_LIST_PUBLISH],
"", NULL, set, NULL, NULL,
self->priv->conn->self_handle,
TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
@@ -1728,24 +1728,24 @@ tp_test_contact_list_manager_remove_from_list (TpTestContactListManager *self,
}
return TRUE;
- case INVALID_TP_TEST_CONTACT_LIST:
+ case INVALID_TP_TESTS_CONTACT_LIST:
default:
g_return_val_if_reached (FALSE);
}
}
-TpTestContactListPresence
-tp_test_contact_list_manager_get_presence (TpTestContactListManager *self,
+TpTestsContactListPresence
+tp_tests_contact_list_manager_get_presence (TpTestsContactListManager *self,
TpHandle contact)
{
- TpTestContactDetails *d = lookup_contact (self, contact);
+ TpTestsContactDetails *d = lookup_contact (self, contact);
const gchar *id;
if (d == NULL || !d->subscribe)
{
/* we don't know the presence of people not on the subscribe list,
* by definition */
- return TP_TEST_CONTACT_LIST_PRESENCE_UNKNOWN;
+ return TP_TESTS_CONTACT_LIST_PRESENCE_UNKNOWN;
}
id = tp_handle_inspect (self->priv->contact_repo, contact);
@@ -1755,17 +1755,17 @@ tp_test_contact_list_manager_get_presence (TpTestContactListManager *self,
* (including non-alphabetic and non-ASCII initial letters) are away. */
if ((id[0] >= 'A' && id[0] <= 'M') || (id[0] >= 'a' && id[0] <= 'm'))
{
- return TP_TEST_CONTACT_LIST_PRESENCE_AVAILABLE;
+ return TP_TESTS_CONTACT_LIST_PRESENCE_AVAILABLE;
}
- return TP_TEST_CONTACT_LIST_PRESENCE_AWAY;
+ return TP_TESTS_CONTACT_LIST_PRESENCE_AWAY;
}
const gchar *
-tp_test_contact_list_manager_get_alias (TpTestContactListManager *self,
+tp_tests_contact_list_manager_get_alias (TpTestsContactListManager *self,
TpHandle contact)
{
- TpTestContactDetails *d = lookup_contact (self, contact);
+ TpTestsContactDetails *d = lookup_contact (self, contact);
if (d == NULL)
{
@@ -1777,14 +1777,14 @@ tp_test_contact_list_manager_get_alias (TpTestContactListManager *self,
}
void
-tp_test_contact_list_manager_set_alias (TpTestContactListManager *self,
+tp_tests_contact_list_manager_set_alias (TpTestsContactListManager *self,
TpHandle contact,
const gchar *alias)
{
gboolean created;
- TpTestContactDetails *d = ensure_contact (self, contact, &created);
- TpTestContactList *stored = self->priv->lists[
- TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactDetails *d = ensure_contact (self, contact, &created);
+ TpTestsContactList *stored = self->priv->lists[
+ TP_TESTS_CONTACT_LIST_STORED];
gchar *old = d->alias;
TpIntSet *set;
@@ -1810,10 +1810,10 @@ tp_test_contact_list_manager_set_alias (TpTestContactListManager *self,
}
GPtrArray *
-tp_test_contact_list_manager_get_contact_info (TpTestContactListManager *self,
+tp_tests_contact_list_manager_get_contact_info (TpTestsContactListManager *self,
TpHandle contact)
{
- TpTestContactDetails *d = lookup_contact (self, contact);
+ TpTestsContactDetails *d = lookup_contact (self, contact);
if (d != NULL)
return d->contact_info;
@@ -1822,13 +1822,13 @@ tp_test_contact_list_manager_get_contact_info (TpTestContactListManager *self,
}
void
-tp_test_contact_list_manager_set_contact_info (TpTestContactListManager *self,
+tp_tests_contact_list_manager_set_contact_info (TpTestsContactListManager *self,
const GPtrArray *contact_info)
{
- TpTestContactList *stored = self->priv->lists[
- TP_TEST_CONTACT_LIST_STORED];
+ TpTestsContactList *stored = self->priv->lists[
+ TP_TESTS_CONTACT_LIST_STORED];
GPtrArray *old;
- TpTestContactDetails *d = ensure_contact (self, self->priv->conn->self_handle,
+ TpTestsContactDetails *d = ensure_contact (self, self->priv->conn->self_handle,
NULL);
d->id = g_strdup (tp_handle_inspect (self->priv->contact_repo,
self->priv->conn->self_handle));
diff --git a/tests/lib/telepathy/contactlist/contact-list-manager.h b/tests/lib/telepathy/contactlist/contact-list-manager.h
index 4d9f050..8c480b9 100644
--- a/tests/lib/telepathy/contactlist/contact-list-manager.h
+++ b/tests/lib/telepathy/contactlist/contact-list-manager.h
@@ -9,8 +9,8 @@
* notice and this notice are preserved.
*/
-#ifndef __TP_TEST_CONTACT_LIST_MANAGER_H__
-#define __TP_TEST_CONTACT_LIST_MANAGER_H__
+#ifndef __TP_TESTS_CONTACT_LIST_MANAGER_H__
+#define __TP_TESTS_CONTACT_LIST_MANAGER_H__
#include <glib-object.h>
@@ -20,92 +20,92 @@
G_BEGIN_DECLS
-typedef struct _TpTestContactListManager TpTestContactListManager;
-typedef struct _TpTestContactListManagerClass TpTestContactListManagerClass;
-typedef struct _TpTestContactListManagerPrivate TpTestContactListManagerPrivate;
+typedef struct _TpTestsContactListManager TpTestsContactListManager;
+typedef struct _TpTestsContactListManagerClass TpTestsContactListManagerClass;
+typedef struct _TpTestsContactListManagerPrivate TpTestsContactListManagerPrivate;
-struct _TpTestContactListManagerClass {
+struct _TpTestsContactListManagerClass {
GObjectClass parent_class;
};
-struct _TpTestContactListManager {
+struct _TpTestsContactListManager {
GObject parent;
- TpTestContactListManagerPrivate *priv;
+ TpTestsContactListManagerPrivate *priv;
};
-GType tp_test_contact_list_manager_get_type (void);
-
-#define TP_TEST_TYPE_CONTACT_LIST_MANAGER \
- (tp_test_contact_list_manager_get_type ())
-#define TP_TEST_CONTACT_LIST_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TEST_TYPE_CONTACT_LIST_MANAGER, \
- TpTestContactListManager))
-#define TP_TEST_CONTACT_LIST_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TEST_TYPE_CONTACT_LIST_MANAGER, \
- TpTestContactListManagerClass))
-#define TP_TEST_IS_CONTACT_LIST_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TEST_TYPE_CONTACT_LIST_MANAGER))
-#define TP_TEST_IS_CONTACT_LIST_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TEST_TYPE_CONTACT_LIST_MANAGER))
-#define TP_TEST_CONTACT_LIST_MANAGER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_CONTACT_LIST_MANAGER, \
- TpTestContactListManagerClass))
-
-gboolean tp_test_contact_list_manager_add_to_group (
- TpTestContactListManager *self, GObject *channel,
+GType tp_tests_contact_list_manager_get_type (void);
+
+#define TP_TESTS_TYPE_CONTACT_LIST_MANAGER \
+ (tp_tests_contact_list_manager_get_type ())
+#define TP_TESTS_CONTACT_LIST_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TESTS_TYPE_CONTACT_LIST_MANAGER, \
+ TpTestsContactListManager))
+#define TP_TESTS_CONTACT_LIST_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), TP_TESTS_TYPE_CONTACT_LIST_MANAGER, \
+ TpTestsContactListManagerClass))
+#define TP_TESTS_IS_CONTACT_LIST_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TESTS_TYPE_CONTACT_LIST_MANAGER))
+#define TP_TESTS_IS_CONTACT_LIST_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TESTS_TYPE_CONTACT_LIST_MANAGER))
+#define TP_TESTS_CONTACT_LIST_MANAGER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_CONTACT_LIST_MANAGER, \
+ TpTestsContactListManagerClass))
+
+gboolean tp_tests_contact_list_manager_add_to_group (
+ TpTestsContactListManager *self, GObject *channel,
TpHandle group, TpHandle member, const gchar *message, GError **error);
-gboolean tp_test_contact_list_manager_remove_from_group (
- TpTestContactListManager *self, GObject *channel,
+gboolean tp_tests_contact_list_manager_remove_from_group (
+ TpTestsContactListManager *self, GObject *channel,
TpHandle group, TpHandle member, const gchar *message, GError **error);
/* elements 1, 2... of this enum must be kept in sync with elements 0, 1...
* of the array _contact_lists in contact-list-manager.h */
typedef enum {
- INVALID_TP_TEST_CONTACT_LIST,
- TP_TEST_CONTACT_LIST_SUBSCRIBE = 1,
- TP_TEST_CONTACT_LIST_PUBLISH,
- TP_TEST_CONTACT_LIST_STORED
-} TpTestContactListHandle;
+ INVALID_TP_TESTS_CONTACT_LIST,
+ TP_TESTS_CONTACT_LIST_SUBSCRIBE = 1,
+ TP_TESTS_CONTACT_LIST_PUBLISH,
+ TP_TESTS_CONTACT_LIST_STORED
+} TpTestsContactListHandle;
-#define NUM_TP_TEST_CONTACT_LISTS TP_TEST_CONTACT_LIST_STORED + 1
+#define NUM_TP_TESTS_CONTACT_LISTS TP_TESTS_CONTACT_LIST_STORED + 1
/* this enum must be kept in sync with the array _statuses in
* contact-list-manager.c */
typedef enum {
- TP_TEST_CONTACT_LIST_PRESENCE_OFFLINE = 0,
- TP_TEST_CONTACT_LIST_PRESENCE_UNKNOWN,
- TP_TEST_CONTACT_LIST_PRESENCE_ERROR,
- TP_TEST_CONTACT_LIST_PRESENCE_AWAY,
- TP_TEST_CONTACT_LIST_PRESENCE_AVAILABLE
-} TpTestContactListPresence;
-
-const TpPresenceStatusSpec *tp_test_contact_list_presence_statuses (
+ TP_TESTS_CONTACT_LIST_PRESENCE_OFFLINE = 0,
+ TP_TESTS_CONTACT_LIST_PRESENCE_UNKNOWN,
+ TP_TESTS_CONTACT_LIST_PRESENCE_ERROR,
+ TP_TESTS_CONTACT_LIST_PRESENCE_AWAY,
+ TP_TESTS_CONTACT_LIST_PRESENCE_AVAILABLE
+} TpTestsContactListPresence;
+
+const TpPresenceStatusSpec *tp_tests_contact_list_presence_statuses (
void);
-gboolean tp_test_contact_list_manager_add_to_list (
- TpTestContactListManager *self, GObject *channel,
- TpTestContactListHandle list, TpHandle member, const gchar *message,
+gboolean tp_tests_contact_list_manager_add_to_list (
+ TpTestsContactListManager *self, GObject *channel,
+ TpTestsContactListHandle list, TpHandle member, const gchar *message,
GError **error);
-gboolean tp_test_contact_list_manager_remove_from_list (
- TpTestContactListManager *self, GObject *channel,
- TpTestContactListHandle list, TpHandle member, const gchar *message,
+gboolean tp_tests_contact_list_manager_remove_from_list (
+ TpTestsContactListManager *self, GObject *channel,
+ TpTestsContactListHandle list, TpHandle member, const gchar *message,
GError **error);
-const gchar **tp_test_contact_lists (void);
-
-TpTestContactListPresence tp_test_contact_list_manager_get_presence (
- TpTestContactListManager *self, TpHandle contact);
-const gchar *tp_test_contact_list_manager_get_alias (
- TpTestContactListManager *self, TpHandle contact);
-void tp_test_contact_list_manager_set_alias (
- TpTestContactListManager *self, TpHandle contact, const gchar *alias);
-GPtrArray * tp_test_contact_list_manager_get_contact_info (
- TpTestContactListManager *self, TpHandle contact);
-void tp_test_contact_list_manager_set_contact_info (
- TpTestContactListManager *self, const GPtrArray *contact_info);
+const gchar **tp_tests_contact_lists (void);
+
+TpTestsContactListPresence tp_tests_contact_list_manager_get_presence (
+ TpTestsContactListManager *self, TpHandle contact);
+const gchar *tp_tests_contact_list_manager_get_alias (
+ TpTestsContactListManager *self, TpHandle contact);
+void tp_tests_contact_list_manager_set_alias (
+ TpTestsContactListManager *self, TpHandle contact, const gchar *alias);
+GPtrArray * tp_tests_contact_list_manager_get_contact_info (
+ TpTestsContactListManager *self, TpHandle contact);
+void tp_tests_contact_list_manager_set_contact_info (
+ TpTestsContactListManager *self, const GPtrArray *contact_info);
G_END_DECLS
diff --git a/tests/lib/telepathy/contactlist/contact-list.c b/tests/lib/telepathy/contactlist/contact-list.c
index 36f922e..4f27b29 100644
--- a/tests/lib/telepathy/contactlist/contact-list.c
+++ b/tests/lib/telepathy/contactlist/contact-list.c
@@ -23,7 +23,7 @@ static void list_channel_iface_init (gpointer iface, gpointer data);
static void group_channel_iface_init (gpointer iface, gpointer data);
/* Abstract base class */
-G_DEFINE_TYPE_WITH_CODE (TpTestContactListBase, tp_test_contact_list_base,
+G_DEFINE_TYPE_WITH_CODE (TpTestsContactListBase, tp_tests_contact_list_base,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, NULL);
@@ -35,13 +35,13 @@ G_DEFINE_TYPE_WITH_CODE (TpTestContactListBase, tp_test_contact_list_base,
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL))
/* Subclass for handle type LIST */
-G_DEFINE_TYPE_WITH_CODE (TpTestContactList, tp_test_contact_list,
- TP_TEST_TYPE_CONTACT_LIST_BASE,
+G_DEFINE_TYPE_WITH_CODE (TpTestsContactList, tp_tests_contact_list,
+ TP_TESTS_TYPE_CONTACT_LIST_BASE,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, list_channel_iface_init))
/* Subclass for handle type GROUP */
-G_DEFINE_TYPE_WITH_CODE (TpTestContactGroup, tp_test_contact_group,
- TP_TEST_TYPE_CONTACT_LIST_BASE,
+G_DEFINE_TYPE_WITH_CODE (TpTestsContactGroup, tp_tests_contact_group,
+ TP_TESTS_TYPE_CONTACT_LIST_BASE,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, group_channel_iface_init))
static const gchar *contact_list_interfaces[] = {
@@ -67,10 +67,10 @@ enum
N_PROPS
};
-struct _TpTestContactListBasePrivate
+struct _TpTestsContactListBasePrivate
{
TpBaseConnection *conn;
- TpTestContactListManager *manager;
+ TpTestsContactListManager *manager;
gchar *object_path;
TpHandleType handle_type;
TpHandle handle;
@@ -80,43 +80,43 @@ struct _TpTestContactListBasePrivate
unsigned disposed:1;
};
-struct _TpTestContactListPrivate
+struct _TpTestsContactListPrivate
{
int dummy:1;
};
-struct _TpTestContactGroupPrivate
+struct _TpTestsContactGroupPrivate
{
int dummy:1;
};
static void
-tp_test_contact_list_base_init (TpTestContactListBase *self)
+tp_tests_contact_list_base_init (TpTestsContactListBase *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
- TP_TEST_TYPE_CONTACT_LIST_BASE, TpTestContactListBasePrivate);
+ TP_TESTS_TYPE_CONTACT_LIST_BASE, TpTestsContactListBasePrivate);
}
static void
-tp_test_contact_list_init (TpTestContactList *self)
+tp_tests_contact_list_init (TpTestsContactList *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TEST_TYPE_CONTACT_LIST,
- TpTestContactListPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TESTS_TYPE_CONTACT_LIST,
+ TpTestsContactListPrivate);
}
static void
-tp_test_contact_group_init (TpTestContactGroup *self)
+tp_tests_contact_group_init (TpTestsContactGroup *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TEST_TYPE_CONTACT_GROUP,
- TpTestContactGroupPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TESTS_TYPE_CONTACT_GROUP,
+ TpTestsContactGroupPrivate);
}
static void
constructed (GObject *object)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
void (*chain_up) (GObject *) =
- ((GObjectClass *) tp_test_contact_list_base_parent_class)->constructed;
+ ((GObjectClass *) tp_tests_contact_list_base_parent_class)->constructed;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles
(self->priv->conn, TP_HANDLE_TYPE_CONTACT);
TpHandle self_handle = self->priv->conn->self_handle;
@@ -127,14 +127,14 @@ constructed (GObject *object)
chain_up (object);
g_assert (TP_IS_BASE_CONNECTION (self->priv->conn));
- g_assert (TP_TEST_IS_CONTACT_LIST_MANAGER (self->priv->manager));
+ g_assert (TP_TESTS_IS_CONTACT_LIST_MANAGER (self->priv->manager));
tp_dbus_daemon_register_object (
tp_base_connection_get_dbus_daemon (self->priv->conn),
self->priv->object_path, self);
tp_handle_ref (handle_repo, self->priv->handle);
- tp_group_mixin_init (object, G_STRUCT_OFFSET (TpTestContactListBase, group),
+ tp_group_mixin_init (object, G_STRUCT_OFFSET (TpTestsContactListBase, group),
contact_repo, self_handle);
/* Both the subclasses have full support for telepathy-spec 0.17.6. */
tp_group_mixin_change_flags (object,
@@ -144,9 +144,9 @@ constructed (GObject *object)
static void
list_constructed (GObject *object)
{
- TpTestContactList *self = TP_TEST_CONTACT_LIST (object);
+ TpTestsContactList *self = TP_TESTS_CONTACT_LIST (object);
void (*chain_up) (GObject *) =
- ((GObjectClass *) tp_test_contact_list_parent_class)->constructed;
+ ((GObjectClass *) tp_tests_contact_list_parent_class)->constructed;
if (chain_up != NULL)
chain_up (object);
@@ -155,7 +155,7 @@ list_constructed (GObject *object)
switch (self->parent.priv->handle)
{
- case TP_TEST_CONTACT_LIST_PUBLISH:
+ case TP_TESTS_CONTACT_LIST_PUBLISH:
/* We can stop publishing presence to people, but we can't
* start sending people our presence unless they ask for it.
*
@@ -165,7 +165,7 @@ list_constructed (GObject *object)
tp_group_mixin_change_flags (object,
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE, 0);
break;
- case TP_TEST_CONTACT_LIST_STORED:
+ case TP_TESTS_CONTACT_LIST_STORED:
/* We can add people to our roster (not that that's very useful without
* also adding them to subscribe), and we can remove them altogether
* (which implicitly removes them from subscribe, publish, and all
@@ -174,7 +174,7 @@ list_constructed (GObject *object)
tp_group_mixin_change_flags (object,
TP_CHANNEL_GROUP_FLAG_CAN_ADD | TP_CHANNEL_GROUP_FLAG_CAN_REMOVE, 0);
break;
- case TP_TEST_CONTACT_LIST_SUBSCRIBE:
+ case TP_TESTS_CONTACT_LIST_SUBSCRIBE:
/* We can ask people to show us their presence, attaching a message.
* We can also cancel (rescind) requests that they haven't replied to,
* and stop receiving their presence after they allow it.
@@ -193,9 +193,9 @@ list_constructed (GObject *object)
static void
group_constructed (GObject *object)
{
- TpTestContactGroup *self = TP_TEST_CONTACT_GROUP (object);
+ TpTestsContactGroup *self = TP_TESTS_CONTACT_GROUP (object);
void (*chain_up) (GObject *) =
- ((GObjectClass *) tp_test_contact_group_parent_class)->constructed;
+ ((GObjectClass *) tp_tests_contact_group_parent_class)->constructed;
if (chain_up != NULL)
chain_up (object);
@@ -214,7 +214,7 @@ get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
switch (property_id)
{
@@ -285,7 +285,7 @@ set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
switch (property_id)
{
@@ -321,7 +321,7 @@ set_property (GObject *object,
static void
dispose (GObject *object)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
if (self->priv->disposed)
return;
@@ -334,13 +334,13 @@ dispose (GObject *object)
tp_svc_channel_emit_closed (self);
}
- ((GObjectClass *) tp_test_contact_list_base_parent_class)->dispose (object);
+ ((GObjectClass *) tp_tests_contact_list_base_parent_class)->dispose (object);
}
static void
finalize (GObject *object)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
TpHandleRepoIface *handle_repo = tp_base_connection_get_handles
(self->priv->conn, self->priv->handle_type);
@@ -348,7 +348,7 @@ finalize (GObject *object)
g_free (self->priv->object_path);
tp_group_mixin_finalize (object);
- ((GObjectClass *) tp_test_contact_list_base_parent_class)->finalize (object);
+ ((GObjectClass *) tp_tests_contact_list_base_parent_class)->finalize (object);
}
static gboolean
@@ -357,9 +357,9 @@ group_add_member (GObject *object,
const gchar *message,
GError **error)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
- return tp_test_contact_list_manager_add_to_group (self->priv->manager,
+ return tp_tests_contact_list_manager_add_to_group (self->priv->manager,
object, self->priv->handle, handle, message, error);
}
@@ -369,9 +369,9 @@ group_remove_member (GObject *object,
const gchar *message,
GError **error)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
- return tp_test_contact_list_manager_remove_from_group (self->priv->manager,
+ return tp_tests_contact_list_manager_remove_from_group (self->priv->manager,
object, self->priv->handle, handle, message, error);
}
@@ -381,9 +381,9 @@ list_add_member (GObject *object,
const gchar *message,
GError **error)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
- return tp_test_contact_list_manager_add_to_list (self->priv->manager,
+ return tp_tests_contact_list_manager_add_to_list (self->priv->manager,
object, self->priv->handle, handle, message, error);
}
@@ -393,14 +393,14 @@ list_remove_member (GObject *object,
const gchar *message,
GError **error)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (object);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (object);
- return tp_test_contact_list_manager_remove_from_list (self->priv->manager,
+ return tp_tests_contact_list_manager_remove_from_list (self->priv->manager,
object, self->priv->handle, handle, message, error);
}
static void
-tp_test_contact_list_base_class_init (TpTestContactListBaseClass *klass)
+tp_tests_contact_list_base_class_init (TpTestsContactListBaseClass *klass)
{
static TpDBusPropertiesMixinPropImpl channel_props[] = {
{ "TargetHandleType", (gpointer) "handle-type", NULL },
@@ -424,7 +424,7 @@ tp_test_contact_list_base_class_init (TpTestContactListBaseClass *klass)
GObjectClass *object_class = (GObjectClass *) klass;
GParamSpec *param_spec;
- g_type_class_add_private (klass, sizeof (TpTestContactListBasePrivate));
+ g_type_class_add_private (klass, sizeof (TpTestsContactListBasePrivate));
object_class->constructed = constructed;
object_class->set_property = set_property;
@@ -451,9 +451,9 @@ tp_test_contact_list_base_class_init (TpTestContactListBaseClass *klass)
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
- param_spec = g_param_spec_object ("manager", "TpTestContactListManager",
- "TpTestContactListManager object that owns this channel",
- TP_TEST_TYPE_CONTACT_LIST_MANAGER,
+ param_spec = g_param_spec_object ("manager", "TpTestsContactListManager",
+ "TpTestsContactListManager object that owns this channel",
+ TP_TESTS_TYPE_CONTACT_LIST_MANAGER,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_MANAGER, param_spec);
@@ -491,39 +491,39 @@ tp_test_contact_list_base_class_init (TpTestContactListBaseClass *klass)
klass->dbus_properties_class.interfaces = prop_interfaces;
tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListBaseClass, dbus_properties_class));
+ G_STRUCT_OFFSET (TpTestsContactListBaseClass, dbus_properties_class));
/* Group mixin is initialized separately for each subclass - they have
* different callbacks */
}
static void
-tp_test_contact_list_class_init (TpTestContactListClass *klass)
+tp_tests_contact_list_class_init (TpTestsContactListClass *klass)
{
GObjectClass *object_class = (GObjectClass *) klass;
- g_type_class_add_private (klass, sizeof (TpTestContactListPrivate));
+ g_type_class_add_private (klass, sizeof (TpTestsContactListPrivate));
object_class->constructed = list_constructed;
tp_group_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListBaseClass, group_class),
+ G_STRUCT_OFFSET (TpTestsContactListBaseClass, group_class),
list_add_member,
list_remove_member);
tp_group_mixin_init_dbus_properties (object_class);
}
static void
-tp_test_contact_group_class_init (TpTestContactGroupClass *klass)
+tp_tests_contact_group_class_init (TpTestsContactGroupClass *klass)
{
GObjectClass *object_class = (GObjectClass *) klass;
- g_type_class_add_private (klass, sizeof (TpTestContactGroupPrivate));
+ g_type_class_add_private (klass, sizeof (TpTestsContactGroupPrivate));
object_class->constructed = group_constructed;
tp_group_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpTestContactListBaseClass, group_class),
+ G_STRUCT_OFFSET (TpTestsContactListBaseClass, group_class),
group_add_member,
group_remove_member);
tp_group_mixin_init_dbus_properties (object_class);
@@ -543,8 +543,8 @@ static void
group_channel_close (TpSvcChannel *iface,
DBusGMethodInvocation *context)
{
- TpTestContactGroup *self = TP_TEST_CONTACT_GROUP (iface);
- TpTestContactListBase *base = TP_TEST_CONTACT_LIST_BASE (iface);
+ TpTestsContactGroup *self = TP_TESTS_CONTACT_GROUP (iface);
+ TpTestsContactListBase *base = TP_TESTS_CONTACT_LIST_BASE (iface);
if (tp_handle_set_size (base->group.members) > 0)
{
@@ -581,7 +581,7 @@ static void
channel_get_handle (TpSvcChannel *iface,
DBusGMethodInvocation *context)
{
- TpTestContactListBase *self = TP_TEST_CONTACT_LIST_BASE (iface);
+ TpTestsContactListBase *self = TP_TESTS_CONTACT_LIST_BASE (iface);
tp_svc_channel_return_from_get_handle (context, self->priv->handle_type,
self->priv->handle);
diff --git a/tests/lib/telepathy/contactlist/contact-list.h b/tests/lib/telepathy/contactlist/contact-list.h
index 2d7d26b..9d5535b 100644
--- a/tests/lib/telepathy/contactlist/contact-list.h
+++ b/tests/lib/telepathy/contactlist/contact-list.h
@@ -9,8 +9,8 @@
* notice and this notice are preserved.
*/
-#ifndef TP_TEST_CONTACT_LIST_H
-#define TP_TEST_CONTACT_LIST_H
+#ifndef TP_TESTS_CONTACT_LIST_H
+#define TP_TESTS_CONTACT_LIST_H
#include <glib-object.h>
@@ -19,98 +19,98 @@
G_BEGIN_DECLS
-typedef struct _TpTestContactListBase TpTestContactListBase;
-typedef struct _TpTestContactListBaseClass TpTestContactListBaseClass;
-typedef struct _TpTestContactListBasePrivate TpTestContactListBasePrivate;
-
-typedef struct _TpTestContactList TpTestContactList;
-typedef struct _TpTestContactListClass TpTestContactListClass;
-typedef struct _TpTestContactListPrivate TpTestContactListPrivate;
-
-typedef struct _TpTestContactGroup TpTestContactGroup;
-typedef struct _TpTestContactGroupClass TpTestContactGroupClass;
-typedef struct _TpTestContactGroupPrivate TpTestContactGroupPrivate;
-
-GType tp_test_contact_list_base_get_type (void);
-GType tp_test_contact_list_get_type (void);
-GType tp_test_contact_group_get_type (void);
-
-#define TP_TEST_TYPE_CONTACT_LIST_BASE \
- (tp_test_contact_list_base_get_type ())
-#define TP_TEST_CONTACT_LIST_BASE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TEST_TYPE_CONTACT_LIST_BASE, \
- TpTestContactListBase))
-#define TP_TEST_CONTACT_LIST_BASE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TEST_TYPE_CONTACT_LIST_BASE, \
- TpTestContactListBaseClass))
-#define TP_TEST_IS_CONTACT_LIST_BASE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TEST_TYPE_CONTACT_LIST_BASE))
-#define TP_TEST_IS_CONTACT_LIST_BASE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TEST_TYPE_CONTACT_LIST_BASE))
-#define TP_TEST_CONTACT_LIST_BASE_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_CONTACT_LIST_BASE, \
- TpTestContactListBaseClass))
-
-#define TP_TEST_TYPE_CONTACT_LIST \
- (tp_test_contact_list_get_type ())
-#define TP_TEST_CONTACT_LIST(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TEST_TYPE_CONTACT_LIST, \
- TpTestContactList))
-#define TP_TEST_CONTACT_LIST_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TEST_TYPE_CONTACT_LIST, \
- TpTestContactListClass))
-#define TP_TEST_IS_CONTACT_LIST(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TEST_TYPE_CONTACT_LIST))
-#define TP_TEST_IS_CONTACT_LIST_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TEST_TYPE_CONTACT_LIST))
-#define TP_TEST_CONTACT_LIST_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_CONTACT_LIST, \
- TpTestContactListClass))
-
-#define TP_TEST_TYPE_CONTACT_GROUP \
- (tp_test_contact_group_get_type ())
-#define TP_TEST_CONTACT_GROUP(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TEST_TYPE_CONTACT_GROUP, \
- TpTestContactGroup))
-#define TP_TEST_CONTACT_GROUP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TEST_TYPE_CONTACT_GROUP, \
- TpTestContactGroupClass))
-#define TP_TEST_IS_CONTACT_GROUP(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TEST_TYPE_CONTACT_GROUP))
-#define TP_TEST_IS_CONTACT_GROUP_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TEST_TYPE_CONTACT_GROUP))
-#define TP_TEST_CONTACT_GROUP_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TEST_TYPE_CONTACT_GROUP, \
- TpTestContactGroupClass))
-
-struct _TpTestContactListBaseClass {
+typedef struct _TpTestsContactListBase TpTestsContactListBase;
+typedef struct _TpTestsContactListBaseClass TpTestsContactListBaseClass;
+typedef struct _TpTestsContactListBasePrivate TpTestsContactListBasePrivate;
+
+typedef struct _TpTestsContactList TpTestsContactList;
+typedef struct _TpTestsContactListClass TpTestsContactListClass;
+typedef struct _TpTestsContactListPrivate TpTestsContactListPrivate;
+
+typedef struct _TpTestsContactGroup TpTestsContactGroup;
+typedef struct _TpTestsContactGroupClass TpTestsContactGroupClass;
+typedef struct _TpTestsContactGroupPrivate TpTestsContactGroupPrivate;
+
+GType tp_tests_contact_list_base_get_type (void);
+GType tp_tests_contact_list_get_type (void);
+GType tp_tests_contact_group_get_type (void);
+
+#define TP_TESTS_TYPE_CONTACT_LIST_BASE \
+ (tp_tests_contact_list_base_get_type ())
+#define TP_TESTS_CONTACT_LIST_BASE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TESTS_TYPE_CONTACT_LIST_BASE, \
+ TpTestsContactListBase))
+#define TP_TESTS_CONTACT_LIST_BASE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TESTS_TYPE_CONTACT_LIST_BASE, \
+ TpTestsContactListBaseClass))
+#define TP_TESTS_IS_CONTACT_LIST_BASE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TESTS_TYPE_CONTACT_LIST_BASE))
+#define TP_TESTS_IS_CONTACT_LIST_BASE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TESTS_TYPE_CONTACT_LIST_BASE))
+#define TP_TESTS_CONTACT_LIST_BASE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_CONTACT_LIST_BASE, \
+ TpTestsContactListBaseClass))
+
+#define TP_TESTS_TYPE_CONTACT_LIST \
+ (tp_tests_contact_list_get_type ())
+#define TP_TESTS_CONTACT_LIST(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TESTS_TYPE_CONTACT_LIST, \
+ TpTestsContactList))
+#define TP_TESTS_CONTACT_LIST_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TESTS_TYPE_CONTACT_LIST, \
+ TpTestsContactListClass))
+#define TP_TESTS_IS_CONTACT_LIST(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TESTS_TYPE_CONTACT_LIST))
+#define TP_TESTS_IS_CONTACT_LIST_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TESTS_TYPE_CONTACT_LIST))
+#define TP_TESTS_CONTACT_LIST_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_CONTACT_LIST, \
+ TpTestsContactListClass))
+
+#define TP_TESTS_TYPE_CONTACT_GROUP \
+ (tp_tests_contact_group_get_type ())
+#define TP_TESTS_CONTACT_GROUP(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TESTS_TYPE_CONTACT_GROUP, \
+ TpTestsContactGroup))
+#define TP_TESTS_CONTACT_GROUP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TESTS_TYPE_CONTACT_GROUP, \
+ TpTestsContactGroupClass))
+#define TP_TESTS_IS_CONTACT_GROUP(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TESTS_TYPE_CONTACT_GROUP))
+#define TP_TESTS_IS_CONTACT_GROUP_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TESTS_TYPE_CONTACT_GROUP))
+#define TP_TESTS_CONTACT_GROUP_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TESTS_TYPE_CONTACT_GROUP, \
+ TpTestsContactGroupClass))
+
+struct _TpTestsContactListBaseClass {
GObjectClass parent_class;
TpGroupMixinClass group_class;
TpDBusPropertiesMixinClass dbus_properties_class;
};
-struct _TpTestContactListClass {
- TpTestContactListBaseClass parent_class;
+struct _TpTestsContactListClass {
+ TpTestsContactListBaseClass parent_class;
};
-struct _TpTestContactGroupClass {
- TpTestContactListBaseClass parent_class;
+struct _TpTestsContactGroupClass {
+ TpTestsContactListBaseClass parent_class;
};
-struct _TpTestContactListBase {
+struct _TpTestsContactListBase {
GObject parent;
TpGroupMixin group;
- TpTestContactListBasePrivate *priv;
+ TpTestsContactListBasePrivate *priv;
};
-struct _TpTestContactList {
- TpTestContactListBase parent;
- TpTestContactListPrivate *priv;
+struct _TpTestsContactList {
+ TpTestsContactListBase parent;
+ TpTestsContactListPrivate *priv;
};
-struct _TpTestContactGroup {
- TpTestContactListBase parent;
- TpTestContactGroupPrivate *priv;
+struct _TpTestsContactGroup {
+ TpTestsContactListBase parent;
+ TpTestsContactGroupPrivate *priv;
};
G_END_DECLS
diff --git a/tests/telepathy/fake-tp-backend.vala b/tests/telepathy/fake-tp-backend.vala
index 1537d71..14f4a7d 100644
--- a/tests/telepathy/fake-tp-backend.vala
+++ b/tests/telepathy/fake-tp-backend.vala
@@ -17,7 +17,7 @@
* Authors: Philip Withnall <philip tecnocode co uk>
*/
-using TpTest;
+using TpTests;
using Folks;
/* A simple test program to expose the test Telepathy account used by folksâ
@@ -26,7 +26,7 @@ using Folks;
public int main (string[] args)
{
- var tp_backend = new TpTest.Backend ();
+ var tp_backend = new TpTests.Backend ();
tp_backend.set_up ();
void *account_handle = tp_backend.add_account ("protocol", "me example com",
diff --git a/tests/telepathy/individual-properties.vala b/tests/telepathy/individual-properties.vala
index 5bf1771..8580739 100644
--- a/tests/telepathy/individual-properties.vala
+++ b/tests/telepathy/individual-properties.vala
@@ -19,14 +19,14 @@
using DBus;
using TelepathyGLib;
-using TpTest;
+using TpTests;
using Tpf;
using Folks;
using Gee;
public class IndividualPropertiesTests : Folks.TestCase
{
- private TpTest.Backend tp_backend;
+ private TpTests.Backend tp_backend;
private void* _account_handle;
private int _test_timeout = 3;
private HashSet<string> _changes_pending;
@@ -35,7 +35,7 @@ public class IndividualPropertiesTests : Folks.TestCase
{
base ("IndividualProperties");
- this.tp_backend = new TpTest.Backend ();
+ this.tp_backend = new TpTests.Backend ();
this.add_test ("individual properties",
this.test_individual_properties);
diff --git a/tests/telepathy/individual-retrieval.vala b/tests/telepathy/individual-retrieval.vala
index f8d84b4..50ffb98 100644
--- a/tests/telepathy/individual-retrieval.vala
+++ b/tests/telepathy/individual-retrieval.vala
@@ -19,14 +19,14 @@
using DBus;
using TelepathyGLib;
-using TpTest;
+using TpTests;
using Tpf;
using Folks;
using Gee;
public class IndividualRetrievalTests : Folks.TestCase
{
- private TpTest.Backend tp_backend;
+ private TpTests.Backend tp_backend;
private void* _account_handle;
private HashSet<string> default_individuals;
private int _test_timeout = 3;
@@ -35,7 +35,7 @@ public class IndividualRetrievalTests : Folks.TestCase
{
base ("IndividualRetrieval");
- this.tp_backend = new TpTest.Backend ();
+ this.tp_backend = new TpTests.Backend ();
/* IDs of the individuals we expect to see.
* These are externally opaque, but internally are SHA-1 hashes of the
diff --git a/tests/telepathy/init.vala b/tests/telepathy/init.vala
index bf8aef6..55fabce 100644
--- a/tests/telepathy/init.vala
+++ b/tests/telepathy/init.vala
@@ -22,14 +22,14 @@ using Folks;
public class InitTests : Folks.TestCase
{
- private TpTest.Backend _tp_backend;
+ private TpTests.Backend _tp_backend;
private int _test_timeout = 5;
public InitTests ()
{
base ("Init");
- this._tp_backend = new TpTest.Backend ();
+ this._tp_backend = new TpTests.Backend ();
/* Set up the tests */
this.add_test ("quiescence", this.test_quiescence);
diff --git a/tests/telepathy/persona-store-capabilities.vala b/tests/telepathy/persona-store-capabilities.vala
index e2de490..a4a046a 100644
--- a/tests/telepathy/persona-store-capabilities.vala
+++ b/tests/telepathy/persona-store-capabilities.vala
@@ -19,14 +19,14 @@
using DBus;
using TelepathyGLib;
-using TpTest;
+using TpTests;
using Tpf;
using Folks;
using Gee;
public class PersonaStoreCapabilitiesTests : Folks.TestCase
{
- private TpTest.Backend tp_backend;
+ private TpTests.Backend tp_backend;
private void* _account_handle;
private HashSet<string> _capabilities_received;
private int _test_timeout = 3;
@@ -35,7 +35,7 @@ public class PersonaStoreCapabilitiesTests : Folks.TestCase
{
base ("PersonaStoreCapabilities");
- this.tp_backend = new TpTest.Backend ();
+ this.tp_backend = new TpTests.Backend ();
this.add_test ("persona store capabilities",
this.test_persona_store_capabilities);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
