Minimal version of contact-run-until-ready test

svn path=/trunk/; revision=759

diff --git a/tests/.gitignore b/tests/.gitignore
index edf303249e22fdeeba73a14f3df2453f743bb76b..9c53998a978cd21c6e5e079bd3dc787e65976a89 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,4 @@
 check-main
 contact-manager
+contact-run-until-ready
 *.log

diff --git a/tests/contact-run-until-ready.c b/tests/contact-run-until-ready.c
index 8f6dfc67bd51146c52c1d1d5234badcb23e9fa1a..ee7a692fbdab7dcb4085fa5902ff61ca75112abd 100644 (file)
--- a/tests/contact-run-until-ready.c
+++ b/tests/contact-run-until-ready.c
@@ -2,43 +2,37 @@
 
 #include <glib.h>
 #include <libempathy/empathy-contact-factory.h>
-#include <libmissincontrol/mc-account.h>
-
-static gboolean
-time_out (gpointer main_loop)
-{
-       g_main_loop_quit (main_loop);
-
-       return FALSE;
-}
+#include <libmissioncontrol/mc-account.h>
 
 int
 main (int argc, char **argv)
 {
        EmpathyContactFactory *factory;
-       GMainLoop             *main_loop;
        McAccount             *account;
        EmpathyContact        *contact;
 
        g_type_init ();
 
-       main_loop = g_main_loop_new (NULL, FALSE);
        factory = empathy_contact_factory_new ();
        account = mc_account_lookup ("jabber4");
-       g_print ("Got account %p\n", account);
+       contact = empathy_contact_factory_get_from_id (factory, account,
+                                                      "testman@jabber.belnet.be");
 
-       contact = empathy_contact_factory_get_from_id ("testman@jabber.belnet.be");
-       g_print ("Got contact with handle %d\n", emapthy_contact_get_handle (contact));
+       g_print ("Contact handle=%d\n", empathy_contact_get_handle (contact));
 
-       empathy_contact_run_until_ready (contact, EMPATHY_CONTACT_READY_HANDLE);
-       g_print ("Contact handle is now %d\n", emapthy_contact_get_handle (contact));
+       empathy_contact_run_until_ready (contact,
+                                        EMPATHY_CONTACT_READY_HANDLE |
+                                        EMPATHY_CONTACT_READY_NAME,
+                                        NULL);
 
-       g_timeout_add_seconds (5, time_out, main_loop);
+       g_print ("Contact ready: handle=%d alias=%s\n",
+                empathy_contact_get_handle (contact),
+                empathy_contact_get_name (contact));
 
-       g_main_loop_run (main_loop);
 
-       g_object_unref (manager);
-       g_main_loop_unref (main_loop);
+       g_object_unref (factory);
+       g_object_unref (account);
+       g_object_unref (contact);
 
        return EXIT_SUCCESS;
 }