[telepathy-glib/master] Tests: use TP_PROP constants and tp_asv_new for channel properties
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Nov 25 03:37:43 PST 2009
---
tests/dbus/callable-example.c | 22 ++++++---------
tests/dbus/channel-introspect.c | 56 +++++++++++++++++++-------------------
tests/dbus/message-mixin.c | 18 +++++-------
3 files changed, 44 insertions(+), 52 deletions(-)
diff --git a/tests/dbus/callable-example.c b/tests/dbus/callable-example.c
index bd8a546..5951609 100644
--- a/tests/dbus/callable-example.c
+++ b/tests/dbus/callable-example.c
@@ -568,16 +568,12 @@ static void
outgoing_call (Test *test,
const gchar *id)
{
- GHashTable *request = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, (GDestroyNotify) tp_g_value_slice_free);
-
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".ChannelType",
- tp_g_value_slice_new_static_string (
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA));
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandleType",
- tp_g_value_slice_new_uint (TP_HANDLE_TYPE_CONTACT));
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetID",
- tp_g_value_slice_new_string (id));
+ GHashTable *request = tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, id,
+ NULL);
tp_cli_connection_interface_requests_call_create_channel (test->conn, -1,
request, channel_created_cb, test, NULL, NULL);
@@ -1355,7 +1351,7 @@ expect_incoming_call_cb (TpConnection *conn,
const gchar *channel_type;
channel_type = tp_asv_get_string (properties,
- TP_IFACE_CHANNEL ".ChannelType");
+ TP_PROP_CHANNEL_CHANNEL_TYPE);
if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
{
/* don't care about this channel */
@@ -1363,10 +1359,10 @@ expect_incoming_call_cb (TpConnection *conn,
}
g_assert_cmpuint (tp_asv_get_uint32 (properties,
- TP_IFACE_CHANNEL ".TargetHandleType", NULL),
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL),
==, TP_HANDLE_TYPE_CONTACT);
g_assert_cmpint (tp_asv_get_boolean (properties,
- TP_IFACE_CHANNEL ".Requested", NULL), ==, FALSE);
+ TP_PROP_CHANNEL_REQUESTED, NULL), ==, FALSE);
/* we only expect to receive one call */
g_assert (test->chan == NULL);
diff --git a/tests/dbus/channel-introspect.c b/tests/dbus/channel-introspect.c
index 04e769c..d630c51 100644
--- a/tests/dbus/channel-introspect.c
+++ b/tests/dbus/channel-introspect.c
@@ -71,16 +71,16 @@ assert_chan_sane (TpChannel *chan,
asv = tp_channel_borrow_immutable_properties (chan);
MYASSERT (asv != NULL, "");
MYASSERT_SAME_STRING (
- tp_asv_get_string (asv, TP_IFACE_CHANNEL ".ChannelType"),
+ tp_asv_get_string (asv, TP_PROP_CHANNEL_CHANNEL_TYPE),
TP_IFACE_CHANNEL_TYPE_TEXT);
MYASSERT_SAME_UINT (
- tp_asv_get_uint32 (asv, TP_IFACE_CHANNEL ".TargetHandleType", NULL),
+ tp_asv_get_uint32 (asv, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL),
TP_HANDLE_TYPE_CONTACT);
MYASSERT_SAME_UINT (
- tp_asv_get_uint32 (asv, TP_IFACE_CHANNEL ".TargetHandle", NULL),
+ tp_asv_get_uint32 (asv, TP_PROP_CHANNEL_TARGET_HANDLE, NULL),
handle);
MYASSERT_SAME_STRING (
- tp_asv_get_string (asv, TP_IFACE_CHANNEL ".TargetID"),
+ tp_asv_get_string (asv, TP_PROP_CHANNEL_TARGET_ID),
IDENTIFIER);
}
@@ -267,15 +267,15 @@ main (int argc,
->dbus_property_interfaces_retrieved);
asv = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
- TP_IFACE_CHANNEL ".TargetHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".TargetID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".InitiatorHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".InitiatorID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".Interfaces", G_TYPE_STRV, NULL,
- TP_IFACE_CHANNEL ".Requested", G_TYPE_BOOLEAN, FALSE,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INITIATOR_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_INITIATOR_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INTERFACES, G_TYPE_STRV, NULL,
+ TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
NULL);
chan = tp_channel_new_from_properties (conn, props_chan_path, asv, &error);
@@ -323,16 +323,16 @@ main (int argc,
};
asv = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
- TP_IFACE_CHANNEL ".TargetHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".TargetID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".InitiatorHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".InitiatorID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".Interfaces", G_TYPE_STRV, interfaces,
- TP_IFACE_CHANNEL ".Requested", G_TYPE_BOOLEAN, FALSE,
+ TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INITIATOR_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_INITIATOR_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INTERFACES, G_TYPE_STRV, interfaces,
+ TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
NULL);
}
@@ -497,16 +497,16 @@ main (int argc,
};
asv = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
- TP_IFACE_CHANNEL ".TargetHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".TargetID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".InitiatorHandle", G_TYPE_UINT, handle,
- TP_IFACE_CHANNEL ".InitiatorID", G_TYPE_STRING, IDENTIFIER,
- TP_IFACE_CHANNEL ".Interfaces", G_TYPE_STRV, interfaces,
- TP_IFACE_CHANNEL ".Requested", G_TYPE_BOOLEAN, FALSE,
+ TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INITIATOR_HANDLE, G_TYPE_UINT, handle,
+ TP_PROP_CHANNEL_INITIATOR_ID, G_TYPE_STRING, IDENTIFIER,
+ TP_PROP_CHANNEL_INTERFACES, G_TYPE_STRV, interfaces,
+ TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
NULL);
}
diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
index 06d68ef..c5bf478 100644
--- a/tests/dbus/message-mixin.c
+++ b/tests/dbus/message-mixin.c
@@ -242,17 +242,13 @@ main (int argc,
test_assert_no_error (error);
{
- GHashTable *request = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, (GDestroyNotify) tp_g_value_slice_free);
-
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".ChannelType",
- tp_g_value_slice_new_static_string (TP_IFACE_CHANNEL_TYPE_TEXT));
-
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandleType",
- tp_g_value_slice_new_uint (TP_HANDLE_TYPE_CONTACT));
-
- g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandle",
- tp_g_value_slice_new_uint (handle));
+ GHashTable *request = tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+ G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
+ NULL);
tp_cli_connection_interface_requests_run_create_channel (conn, -1,
request, &chan_path, NULL, &error, NULL);
--
1.5.6.5
More information about the telepathy-commits
mailing list