check-empathy-irc-network-manager: networks order isn't garantee anymore

1 files changed, 29 insertions, 10 deletions

diff --git a/tests/check-empathy-irc-network-manager.c b/tests/check-empathy-irc-network-manager.c
index fbf97a920..777b547b3 100644
--- a/tests/check-empathy-irc-network-manager.c
+++ b/tests/check-empathy-irc-network-manager.c
@@ -16,7 +16,6 @@ START_TEST (test_load_global_file)
   EmpathyIrcNetworkManager *mgr;
   gchar *global_file, *user_file;
   GSList *networks, *l;
-  EmpathyIrcNetwork *network;
   struct server_t freenode_servers[] = {
     { "irc.freenode.net", 6667, FALSE },
     { "irc.eu.freenode.net", 6667, FALSE }};
@@ -25,6 +24,7 @@ START_TEST (test_load_global_file)
     { "irc.us.gimp.org", 6667, FALSE }};
   struct server_t test_servers[] = {
     { "irc.test.org", 6669, TRUE }};
+  gboolean network_checked[3];
 
   mgr = empathy_irc_network_manager_new (GLOBAL_SAMPLE, NULL);
 
@@ -40,17 +40,36 @@ START_TEST (test_load_global_file)
   networks = empathy_irc_network_manager_get_networks (mgr);
   fail_if (g_slist_length (networks) != 3);
 
+  network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
   /* check networks and servers */
-  l = networks;
+  for (l = networks; l != NULL; l = g_slist_next (l))
+    {
+      gchar *name;
 
-  network = l->data;
-  check_network (network, "freenode", "Freenode", freenode_servers, 2);
-  l = g_slist_next (l);
-  network = l->data;
-  check_network (network, "gimpnet", "GIMPNet", gimpnet_servers, 2);
-  l = g_slist_next (l);
-  network = l->data;
-  check_network (network, "testsrv", "Test Server", test_servers, 1);
+      g_object_get (l->data, "name", &name, NULL);
+      fail_if (name == NULL);
+
+      if (strcmp (name, "Freenode") == 0)
+        {
+          check_network (l->data, "freenode", "Freenode", freenode_servers, 2);
+          network_checked[0] = TRUE;
+        }
+      else if (strcmp (name, "GIMPNet") == 0)
+        {
+          check_network (l->data, "gimpnet", "GIMPNet", gimpnet_servers, 2);
+          network_checked[1] = TRUE;
+        }
+      else if (strcmp (name, "Test Server") == 0)
+        {
+          check_network (l->data, "testsrv", "Test Server", test_servers, 1);
+          network_checked[2] = TRUE;
+        }
+      else
+        {
+          fail_if (TRUE);
+        }
+    }
+  fail_if (!network_checked[0] || !network_checked[1] || !network_checked[2]);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);