[Telepathy-commits] [telepathy-gabble/master] rename test-gabble-presence to test-presence

Dafydd Harries dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:20 PDT 2008


20080714125223-c9803-e14004ce94fe1ae7642907e0f5523a5904bb2186.gz
---
 tests/Makefile.am            |    8 +-
 tests/test-gabble-presence.c |  172 ------------------------------------------
 tests/test-presence.c        |  172 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 tests/test-gabble-presence.c
 create mode 100644 tests/test-presence.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32af39c..387e7b4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,13 +9,13 @@ SUBDIRS = $(CHECKTWISTED)
 
 noinst_PROGRAMS = \
 	$(dbus_test_programs) \
-	test-gabble-presence \
 	test-base64 \
 	test-handles \
 	test-jid-decode \
-	test-parse-message
+	test-parse-message \
+	test-presence
 
-test_gabble_presence_LDADD = \
+test_presence_LDADD = \
     $(top_builddir)/src/libgabble-convenience.la $(ALL_LIBS)
 
 test_base64_LDADD = \
@@ -58,7 +58,7 @@ endif
 check_c_sources = \
 	$(dbus_test_sources) \
 	test-base64.c \
-	test-gabble-presence.c \
+	test-presence.c \
 	test-jid-decode.c \
 	test-handles.c \
 	test-parse-message.c
diff --git a/tests/test-gabble-presence.c b/tests/test-gabble-presence.c
deleted file mode 100644
index d8871eb..0000000
--- a/tests/test-gabble-presence.c
+++ /dev/null
@@ -1,172 +0,0 @@
-
-#include <string.h>
-#include <unistd.h>
-
-#include <glib.h>
-
-#include "src/presence.h"
-
-int main (int argc, char **argv)
-{
-  const gchar *resource;
-  gchar *dump;
-  GabblePresence *presence;
-
-  g_type_init ();
-
-  presence = gabble_presence_new ();
-  g_assert (GABBLE_PRESENCE_OFFLINE == presence->status);
-  g_assert (NULL == presence->status_message);
-
-  /* offline presence from unknown resource: no change */
-  g_assert (FALSE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_OFFLINE, NULL, 0));
-  /* available presence from unknown resource: change */
-  g_assert (TRUE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_AVAILABLE, NULL, 0));
-
-  /* accumulated presence has changed; status message unchanged */
-  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
-  g_assert (NULL == presence->status_message);
-
-  /* available presence again; no change */
-  g_assert (FALSE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_AVAILABLE, NULL, 0));
-  /* available presence again, but with status message: change */
-  g_assert (TRUE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
-
-  /* accumulated presence unchanged; status message changed */
-  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
-  g_assert (0 == strcmp ("status message", presence->status_message));
-
-  /* same presence again; no change */
-  g_assert (FALSE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
-
-  /* sleep a while so the next resource will have different timestamp */
-  sleep (1);
-
-  /* presence from different resource, but equal present-ness; unchanged */
-  g_assert (FALSE == gabble_presence_update (presence, "bar",
-    GABBLE_PRESENCE_AVAILABLE, "dingoes", 0));
-
-  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
-  g_assert (0 == strcmp ("status message", presence->status_message));
-
-  /* but if we were to make a voip call, we would prefer the newer one */
-  g_assert (0 == strcmp ("bar",
-        gabble_presence_pick_resource_by_caps (presence, 0)));
-
-  /* sleep a while so the next resource will have different timestamp */
-  sleep (1);
-
-  /* presence with higher priority; presence and message changed */
-  g_assert (TRUE == gabble_presence_update (presence, "bar",
-    GABBLE_PRESENCE_AVAILABLE, "dingoes", 1));
-
-  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
-  g_assert (0 == strcmp ("dingoes", presence->status_message));
-
-  /* sleep a while so the next resource will have different timestamp */
-  sleep (1);
-
-  /* now foo is newer, so the next voip call would prefer that */
-  g_assert (FALSE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
-  g_assert (0 == strcmp ("foo",
-        gabble_presence_pick_resource_by_caps (presence, 0)));
-
-  /* sleep a while so the next resource will have different timestamp */
-  sleep (1);
-
-  /* presence from first resource with greated present-ness: change */
-  g_assert (TRUE == gabble_presence_update (presence, "foo",
-    GABBLE_PRESENCE_CHAT, "status message", 0));
-
-  /* sleep a while so the next resource will have different timestamp */
-  sleep (1);
-
-  /* make bar be the latest presence: no change, since foo is more present */
-  g_assert (FALSE == gabble_presence_update (presence, "bar",
-    GABBLE_PRESENCE_AVAILABLE, "dingoes", 1));
-
-  /* we still prefer foo for the voip calls, because it's more present */
-  g_assert (0 == strcmp ("foo",
-        gabble_presence_pick_resource_by_caps (presence, 0)));
-
-  g_assert (GABBLE_PRESENCE_CHAT == presence->status);
-  g_assert (0 == strcmp ("status message", presence->status_message));
-
-  /* no resource has the Google voice cap */
-  resource = gabble_presence_pick_resource_by_caps (presence,
-    PRESENCE_CAP_GOOGLE_VOICE);
-  g_assert (NULL == resource);
-
-  /* give voice cap to second resource, but make priority negative */
-  g_assert (FALSE == gabble_presence_update (presence, "bar",
-    GABBLE_PRESENCE_AVAILABLE, "dingoes", -1));
-  gabble_presence_set_capabilities (presence, "bar",
-      PRESENCE_CAP_GOOGLE_VOICE, 0);
-
-  dump = gabble_presence_dump (presence);
-  g_assert (0 == strcmp (dump,
-    "nickname: (null)\n"
-    "accumulated status: 6\n"
-    "accumulated status msg: status message\n"
-    "accumulated capabilities: 2\n"
-    "kept while unavailable: 0\n"
-    "resources:\n"
-    "  foo\n"
-    "    capabilities: 0\n"
-    "    status: 6\n"
-    "    status msg: status message\n"
-    "    priority: 0\n"
-    "  bar\n"
-    "    capabilities: 2\n"
-    "    status: 5\n"
-    "    status msg: dingoes\n"
-    "    priority: -1\n"));
-  g_free (dump);
-
-  /* no resource with non-negative priority has the Google voice cap */
-  resource = gabble_presence_pick_resource_by_caps (presence,
-    PRESENCE_CAP_GOOGLE_VOICE);
-  g_assert (NULL == resource);
-
-  /* give voice cap to first resource */
-  gabble_presence_set_capabilities (presence, "foo",
-      PRESENCE_CAP_GOOGLE_VOICE, 0);
-
-  /* resource has voice cap */
-  resource = gabble_presence_pick_resource_by_caps (presence,
-    PRESENCE_CAP_GOOGLE_VOICE);
-  g_assert (0 == strcmp ("foo", resource));
-
-  /* presence turns up from null resource; it trumps other presence regardless
-   * of whether status is more present or not */
-  g_assert (TRUE == gabble_presence_update (presence, NULL,
-    GABBLE_PRESENCE_OFFLINE, "gone", 0));
-  g_assert (GABBLE_PRESENCE_OFFLINE == presence->status);
-  g_assert (0 == strcmp ("gone", presence->status_message));
-
-  /* caps are gone too */
-  resource = gabble_presence_pick_resource_by_caps (presence,
-    PRESENCE_CAP_GOOGLE_VOICE);
-  g_assert (NULL == resource);
-
-  dump = gabble_presence_dump (presence);
-  g_assert (0 == strcmp (dump,
-    "nickname: (null)\n"
-    "accumulated status: 0\n"
-    "accumulated status msg: gone\n"
-    "accumulated capabilities: 2\n"
-    "kept while unavailable: 0\n"
-    "resources:\n"
-    "  (none)\n"));
-  g_free (dump);
-
-  g_object_unref (presence);
-  return 0;
-}
-
diff --git a/tests/test-presence.c b/tests/test-presence.c
new file mode 100644
index 0000000..d8871eb
--- /dev/null
+++ b/tests/test-presence.c
@@ -0,0 +1,172 @@
+
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+
+#include "src/presence.h"
+
+int main (int argc, char **argv)
+{
+  const gchar *resource;
+  gchar *dump;
+  GabblePresence *presence;
+
+  g_type_init ();
+
+  presence = gabble_presence_new ();
+  g_assert (GABBLE_PRESENCE_OFFLINE == presence->status);
+  g_assert (NULL == presence->status_message);
+
+  /* offline presence from unknown resource: no change */
+  g_assert (FALSE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_OFFLINE, NULL, 0));
+  /* available presence from unknown resource: change */
+  g_assert (TRUE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_AVAILABLE, NULL, 0));
+
+  /* accumulated presence has changed; status message unchanged */
+  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
+  g_assert (NULL == presence->status_message);
+
+  /* available presence again; no change */
+  g_assert (FALSE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_AVAILABLE, NULL, 0));
+  /* available presence again, but with status message: change */
+  g_assert (TRUE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
+
+  /* accumulated presence unchanged; status message changed */
+  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
+  g_assert (0 == strcmp ("status message", presence->status_message));
+
+  /* same presence again; no change */
+  g_assert (FALSE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
+
+  /* sleep a while so the next resource will have different timestamp */
+  sleep (1);
+
+  /* presence from different resource, but equal present-ness; unchanged */
+  g_assert (FALSE == gabble_presence_update (presence, "bar",
+    GABBLE_PRESENCE_AVAILABLE, "dingoes", 0));
+
+  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
+  g_assert (0 == strcmp ("status message", presence->status_message));
+
+  /* but if we were to make a voip call, we would prefer the newer one */
+  g_assert (0 == strcmp ("bar",
+        gabble_presence_pick_resource_by_caps (presence, 0)));
+
+  /* sleep a while so the next resource will have different timestamp */
+  sleep (1);
+
+  /* presence with higher priority; presence and message changed */
+  g_assert (TRUE == gabble_presence_update (presence, "bar",
+    GABBLE_PRESENCE_AVAILABLE, "dingoes", 1));
+
+  g_assert (GABBLE_PRESENCE_AVAILABLE == presence->status);
+  g_assert (0 == strcmp ("dingoes", presence->status_message));
+
+  /* sleep a while so the next resource will have different timestamp */
+  sleep (1);
+
+  /* now foo is newer, so the next voip call would prefer that */
+  g_assert (FALSE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_AVAILABLE, "status message", 0));
+  g_assert (0 == strcmp ("foo",
+        gabble_presence_pick_resource_by_caps (presence, 0)));
+
+  /* sleep a while so the next resource will have different timestamp */
+  sleep (1);
+
+  /* presence from first resource with greated present-ness: change */
+  g_assert (TRUE == gabble_presence_update (presence, "foo",
+    GABBLE_PRESENCE_CHAT, "status message", 0));
+
+  /* sleep a while so the next resource will have different timestamp */
+  sleep (1);
+
+  /* make bar be the latest presence: no change, since foo is more present */
+  g_assert (FALSE == gabble_presence_update (presence, "bar",
+    GABBLE_PRESENCE_AVAILABLE, "dingoes", 1));
+
+  /* we still prefer foo for the voip calls, because it's more present */
+  g_assert (0 == strcmp ("foo",
+        gabble_presence_pick_resource_by_caps (presence, 0)));
+
+  g_assert (GABBLE_PRESENCE_CHAT == presence->status);
+  g_assert (0 == strcmp ("status message", presence->status_message));
+
+  /* no resource has the Google voice cap */
+  resource = gabble_presence_pick_resource_by_caps (presence,
+    PRESENCE_CAP_GOOGLE_VOICE);
+  g_assert (NULL == resource);
+
+  /* give voice cap to second resource, but make priority negative */
+  g_assert (FALSE == gabble_presence_update (presence, "bar",
+    GABBLE_PRESENCE_AVAILABLE, "dingoes", -1));
+  gabble_presence_set_capabilities (presence, "bar",
+      PRESENCE_CAP_GOOGLE_VOICE, 0);
+
+  dump = gabble_presence_dump (presence);
+  g_assert (0 == strcmp (dump,
+    "nickname: (null)\n"
+    "accumulated status: 6\n"
+    "accumulated status msg: status message\n"
+    "accumulated capabilities: 2\n"
+    "kept while unavailable: 0\n"
+    "resources:\n"
+    "  foo\n"
+    "    capabilities: 0\n"
+    "    status: 6\n"
+    "    status msg: status message\n"
+    "    priority: 0\n"
+    "  bar\n"
+    "    capabilities: 2\n"
+    "    status: 5\n"
+    "    status msg: dingoes\n"
+    "    priority: -1\n"));
+  g_free (dump);
+
+  /* no resource with non-negative priority has the Google voice cap */
+  resource = gabble_presence_pick_resource_by_caps (presence,
+    PRESENCE_CAP_GOOGLE_VOICE);
+  g_assert (NULL == resource);
+
+  /* give voice cap to first resource */
+  gabble_presence_set_capabilities (presence, "foo",
+      PRESENCE_CAP_GOOGLE_VOICE, 0);
+
+  /* resource has voice cap */
+  resource = gabble_presence_pick_resource_by_caps (presence,
+    PRESENCE_CAP_GOOGLE_VOICE);
+  g_assert (0 == strcmp ("foo", resource));
+
+  /* presence turns up from null resource; it trumps other presence regardless
+   * of whether status is more present or not */
+  g_assert (TRUE == gabble_presence_update (presence, NULL,
+    GABBLE_PRESENCE_OFFLINE, "gone", 0));
+  g_assert (GABBLE_PRESENCE_OFFLINE == presence->status);
+  g_assert (0 == strcmp ("gone", presence->status_message));
+
+  /* caps are gone too */
+  resource = gabble_presence_pick_resource_by_caps (presence,
+    PRESENCE_CAP_GOOGLE_VOICE);
+  g_assert (NULL == resource);
+
+  dump = gabble_presence_dump (presence);
+  g_assert (0 == strcmp (dump,
+    "nickname: (null)\n"
+    "accumulated status: 0\n"
+    "accumulated status msg: gone\n"
+    "accumulated capabilities: 2\n"
+    "kept while unavailable: 0\n"
+    "resources:\n"
+    "  (none)\n"));
+  g_free (dump);
+
+  g_object_unref (presence);
+  return 0;
+}
+
-- 
1.5.6.3




More information about the Telepathy-commits mailing list