Minimal version of contact-run-until-ready test

svn path=/trunk/; revision=759

2 files changed, 15 insertions, 20 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index edf303249..9c53998a9 100644
--- 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 8f6dfc67b..ee7a692fb 100644
--- 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;
 }