[telepathy-gabble/master] test-jid-decode: rename server -> domain for consistency

Dafydd Harries dafydd.harries at collabora.co.uk
Tue Aug 25 10:34:04 PDT 2009


---
 tests/test-jid-decode.c |   48 +++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/test-jid-decode.c b/tests/test-jid-decode.c
index 6fefeec..a3c1609 100644
--- a/tests/test-jid-decode.c
+++ b/tests/test-jid-decode.c
@@ -9,58 +9,58 @@ static void
 test1 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (!gabble_decode_jid ("", &node, &server, &resource));
+  g_assert (!gabble_decode_jid ("", &node, &domain, &resource));
   g_assert (node == NULL);
-  g_assert (server == NULL);
+  g_assert (domain == NULL);
   g_assert (resource == NULL);
-  g_free (server);
+  g_free (domain);
 }
 
 static void
 test2 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (gabble_decode_jid ("bar", &node, &server, &resource));
+  g_assert (gabble_decode_jid ("bar", &node, &domain, &resource));
   g_assert (node == NULL);
-  g_assert (0 == strcmp (server, "bar"));
+  g_assert (0 == strcmp (domain, "bar"));
   g_assert (resource == NULL);
-  g_free (server);
+  g_free (domain);
 }
 
 static void
 test3 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (gabble_decode_jid ("foo at bar", &node, &server, &resource));
+  g_assert (gabble_decode_jid ("foo at bar", &node, &domain, &resource));
   g_assert (0 == strcmp (node, "foo"));
-  g_assert (0 == strcmp (server, "bar"));
+  g_assert (0 == strcmp (domain, "bar"));
   g_assert (resource == NULL);
   g_free (node);
-  g_free (server);
+  g_free (domain);
 }
 
 static void
 test4 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (gabble_decode_jid ("foo at bar/baz", &node, &server, &resource));
+  g_assert (gabble_decode_jid ("foo at bar/baz", &node, &domain, &resource));
   g_assert (0 == strcmp (node, "foo"));
-  g_assert (0 == strcmp (server, "bar"));
+  g_assert (0 == strcmp (domain, "bar"));
   g_assert (0 == strcmp (resource, "baz"));
   g_free (node);
-  g_free (server);
+  g_free (domain);
   g_free (resource);
 }
 
@@ -68,15 +68,15 @@ static void
 test5 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (!gabble_decode_jid ("@bar", &node, &server, &resource));
+  g_assert (!gabble_decode_jid ("@bar", &node, &domain, &resource));
   g_assert (node == NULL);
-  g_assert (server == NULL);
+  g_assert (domain == NULL);
   g_assert (resource == NULL);
   g_free (node);
-  g_free (server);
+  g_free (domain);
   g_free (resource);
 }
 
@@ -84,15 +84,15 @@ static void
 test6 (void)
 {
   gchar *node = NULL;
-  gchar *server = NULL;
+  gchar *domain = NULL;
   gchar *resource = NULL;
 
-  g_assert (!gabble_decode_jid ("foo at bar/", &node, &server, &resource));
+  g_assert (!gabble_decode_jid ("foo at bar/", &node, &domain, &resource));
   g_assert (node == NULL);
-  g_assert (server == NULL);
+  g_assert (domain == NULL);
   g_assert (resource == NULL);
   g_free (node);
-  g_free (server);
+  g_free (domain);
   g_free (resource);
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list