empathy r1558 - trunk/tests

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Oct 13 07:54:37 2008
New Revision: 1558
URL: http://svn.gnome.org/viewvc/empathy?rev=1558&view=rev

Log:
factor out check_chatroom

Modified:
   trunk/tests/check-empathy-chatroom-manager.c

Modified: trunk/tests/check-empathy-chatroom-manager.c
==============================================================================
--- trunk/tests/check-empathy-chatroom-manager.c	(original)
+++ trunk/tests/check-empathy-chatroom-manager.c	Mon Oct 13 07:54:37 2008
@@ -17,6 +17,22 @@
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
 #define CHATROOM_FILE "chatrooms.xml"
 
+static void
+check_chatroom (EmpathyChatroom *chatroom,
+                const gchar *name,
+                const gchar *room,
+                gboolean auto_connect,
+                gboolean favorite)
+{
+  gboolean _favorite;
+
+  fail_if (tp_strdiff (empathy_chatroom_get_name (chatroom), name));
+  fail_if (tp_strdiff (empathy_chatroom_get_room (chatroom), room));
+  fail_if (empathy_chatroom_get_auto_connect (chatroom) != auto_connect);
+  g_object_get (chatroom, "favorite", &_favorite, NULL);
+  fail_if (favorite != _favorite);
+}
+
 START_TEST (test_empathy_chatroom_manager_new)
 {
   EmpathyChatroomManager *mgr;
@@ -48,23 +64,16 @@
   for (l = chatrooms; l != NULL; l = g_list_next (l))
     {
       EmpathyChatroom *chatroom = l->data;
-      gboolean favorite;
 
       if (!tp_strdiff (empathy_chatroom_get_room (chatroom), "room1"))
         {
           room1_found = TRUE;
-          fail_if (tp_strdiff (empathy_chatroom_get_name (chatroom), "name1"));
-          fail_if (!empathy_chatroom_get_auto_connect (chatroom));
-          g_object_get (chatroom, "favorite", &favorite, NULL);
-          fail_if (!favorite);
+          check_chatroom (chatroom, "name1", "room1", TRUE, TRUE);
         }
       else if (!tp_strdiff (empathy_chatroom_get_room (chatroom), "room2"))
         {
           room2_found = TRUE;
-          fail_if (tp_strdiff (empathy_chatroom_get_name (chatroom), "name2"));
-          fail_if (empathy_chatroom_get_auto_connect (chatroom));
-          g_object_get (chatroom, "favorite", &favorite, NULL);
-          fail_if (!favorite);
+          check_chatroom (chatroom, "name2", "room2", FALSE, TRUE);
         }
       else
         {