add a network to default-irc-networks-sample.xml

2 files changed, 41 insertions, 13 deletions

diff --git a/tests/check-empathy-irc-network-manager.c b/tests/check-empathy-irc-network-manager.c
index 7885f95a6..7ea1e13b0 100644
--- a/tests/check-empathy-irc-network-manager.c
+++ b/tests/check-empathy-irc-network-manager.c
@@ -74,7 +74,9 @@ 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];
+  struct server_t undernet_servers[] = {
+    { "eu.undernet.org", 6667, FALSE }};
+  gboolean network_checked[4];
 
   mgr = empathy_irc_network_manager_new (GLOBAL_SAMPLE, NULL);
 
@@ -88,9 +90,10 @@ START_TEST (test_load_global_file)
   g_free (user_file);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  fail_if (g_slist_length (networks) != 3);
+  fail_if (g_slist_length (networks) != 4);
 
-  network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
+  network_checked[0] = network_checked[1] = network_checked[2] =
+    network_checked[3] = FALSE;
   /* check networks and servers */
   for (l = networks; l != NULL; l = g_slist_next (l))
     {
@@ -114,6 +117,11 @@ START_TEST (test_load_global_file)
           check_network (l->data, "Test Server", test_servers, 1);
           network_checked[2] = TRUE;
         }
+      else if (strcmp (name, "Undernet") == 0)
+        {
+          check_network (l->data, "Undernet", undernet_servers, 1);
+          network_checked[3] = TRUE;
+        }
       else
         {
           fail_if (TRUE);
@@ -121,7 +129,8 @@ START_TEST (test_load_global_file)
 
       g_free (name);
     }
-  fail_if (!network_checked[0] || !network_checked[1] || !network_checked[2]);
+  fail_if (!network_checked[0] || !network_checked[1] || !network_checked[2] ||
+      !network_checked[3]);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
@@ -171,7 +180,9 @@ START_TEST (test_empathy_irc_network_manager_remove)
     { "irc.eu.freenode.net", 6667, FALSE }};
   struct server_t test_servers[] = {
     { "irc.test.org", 6669, TRUE }};
-  gboolean network_checked[2];
+  struct server_t undernet_servers[] = {
+    { "eu.undernet.org", 6667, FALSE }};
+  gboolean network_checked[3];
   gboolean result;
 
   mgr = empathy_irc_network_manager_new (GLOBAL_SAMPLE, NULL);
@@ -180,9 +191,9 @@ START_TEST (test_empathy_irc_network_manager_remove)
   fail_if (!result);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  fail_if (g_slist_length (networks) != 2);
+  fail_if (g_slist_length (networks) != 3);
 
-  network_checked[0] = network_checked[1] = FALSE;
+  network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
   /* check networks and servers */
   for (l = networks; l != NULL; l = g_slist_next (l))
     {
@@ -201,6 +212,11 @@ START_TEST (test_empathy_irc_network_manager_remove)
           check_network (l->data, "Test Server", test_servers, 1);
           network_checked[1] = TRUE;
         }
+      else if (strcmp (name, "Undernet") == 0)
+        {
+          check_network (l->data, "Undernet", undernet_servers, 1);
+          network_checked[2] = TRUE;
+        }
       else
         {
           fail_if (TRUE);
@@ -208,7 +224,7 @@ START_TEST (test_empathy_irc_network_manager_remove)
 
       g_free (name);
     }
-  fail_if (!network_checked[0] || !network_checked[1]);
+  fail_if (!network_checked[0] || !network_checked[1] || !network_checked[2]);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
@@ -317,7 +333,9 @@ START_TEST (test_load_both_files)
     { "irc.mysrv.net", 7495, TRUE }};
   struct server_t another_server[] = {
     { "irc.anothersrv.be", 6660, FALSE }};
-  gboolean network_checked[4];
+  struct server_t undernet_servers[] = {
+    { "eu.undernet.org", 6667, FALSE }};
+  gboolean network_checked[5];
 
   mgr = empathy_irc_network_manager_new (GLOBAL_SAMPLE, USER_FILE);
 
@@ -331,10 +349,10 @@ START_TEST (test_load_both_files)
   g_free (user_file);
 
   networks = empathy_irc_network_manager_get_networks (mgr);
-  fail_if (g_slist_length (networks) != 4);
+  fail_if (g_slist_length (networks) != 5);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
-    network_checked[3] = FALSE;
+    network_checked[3] = network_checked[4] = FALSE;
   /* check networks and servers */
   for (l = networks; l != NULL; l = g_slist_next (l))
     {
@@ -363,6 +381,11 @@ START_TEST (test_load_both_files)
           check_network (l->data, "Another Server", another_server, 1);
           network_checked[3] = TRUE;
         }
+      else if (strcmp (name, "Undernet") == 0)
+        {
+          check_network (l->data, "Undernet", undernet_servers, 1);
+          network_checked[4] = TRUE;
+        }
       else
         {
           fail_if (TRUE);
@@ -371,7 +394,7 @@ START_TEST (test_load_both_files)
       g_free (name);
     }
   fail_if (!network_checked[0] || !network_checked[1] || !network_checked[2] ||
-      !network_checked[3]);
+      !network_checked[3] || !network_checked[4]);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
@@ -538,7 +561,6 @@ START_TEST (test_modify_user_file)
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
   g_slist_free (networks);
   g_object_unref (mgr);
-
 }
 END_TEST
 
diff --git a/tests/xml/default-irc-networks-sample.xml b/tests/xml/default-irc-networks-sample.xml
index c2a2a00a9..beff14cd1 100644
--- a/tests/xml/default-irc-networks-sample.xml
+++ b/tests/xml/default-irc-networks-sample.xml
@@ -21,4 +21,10 @@
     </servers>
   </network>
 
+  <network id="undernet" name="Undernet">
+    <servers>
+      <server address="eu.undernet.org" port="6667" ssl="FALSE" />
+    </servers>
+  </network>
+
 </networks>