summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2013-02-22 10:41:46 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2013-02-22 10:41:46 +0000
commitf236fff2b16dd135b025c7291ae4383b945bcc4e (patch)
treeb764443d8b77153f16c2e10767e0638201948e64
parent57fa65482d32721a31403c8f09af8ea6ee431a6f (diff)
connector-test: use properly-named variables.
This made the assertion that failed confusing: the message was about 'identity', but it was actually a test of the 'resource' property.
-rw-r--r--tests/wocky-connector-test.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c
index a25fbac..c6914f0 100644
--- a/tests/wocky-connector-test.c
+++ b/tests/wocky-connector-test.c
@@ -3610,7 +3610,7 @@ run_test (gpointer data)
if (!strcmp (test->desc, CONNECTOR_INTERNALS_TEST))
{
int i;
- gchar *identity = NULL;
+ gchar *identity, *session_id, *resource;
WockyConnector *tmp =
wocky_connector_new ("foo@bar.org", "abc", "xyz", NULL, NULL);
WockyStanza *feat = NULL;
@@ -3636,17 +3636,17 @@ run_test (gpointer data)
g_object_unref (feat);
identity = NULL;
- g_object_get (wcon, "session-id", &identity, NULL);
- g_assert (identity != NULL);
- g_assert (*identity != '\0');
- g_free (identity);
+ g_object_get (wcon, "session-id", &session_id, NULL);
+ g_assert (session_id != NULL);
+ g_assert (*session_id != '\0');
+ g_free (session_id);
- g_object_get (wcon, "resource", &identity, NULL);
- /* TODO: really? :identity gets updated to contain the actual
+ g_object_get (wcon, "resource", &resource, NULL);
+ /* TODO: really? :resource gets updated to contain the actual
* post-bind resource, but perhaps :resource should be updated too?
*/
- g_assert_cmpstr (identity, ==, NULL);
- g_free (identity);
+ g_assert_cmpstr (resource, ==, NULL);
+ g_free (resource);
g_object_get (wcon, "legacy", &jabber, "old-ssl", &oldssl, NULL);
g_assert (jabber == (gboolean)(xproblem & XMPP_PROBLEM_OLD_SERVER));