[farsight2/master] Add multi-user test

[Olivier Crête]

---
 tests/check/main/generic.c       |    3 ++-
 tests/check/main/rtpconference.c |   36 ++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/tests/check/main/generic.c b/tests/check/main/generic.c
index 9cc0de7..ff9ceb6 100644
--- a/tests/check/main/generic.c
+++ b/tests/check/main/generic.c
@@ -38,7 +38,7 @@ setup_simple_conference (
   GError *error = NULL;
 
   dat->id = id;
-  dat->cname = cname;
+  dat->cname = g_strdup (cname);
 
   dat->pipeline = gst_pipeline_new ("pipeline");
   fail_if (dat->pipeline == NULL);
@@ -106,6 +106,7 @@ cleanup_simple_conference (struct SimpleTestConference *dat)
 
   g_object_unref (dat->session);
   gst_object_unref (dat->pipeline);
+  g_free (dat->cname);
   g_free (dat);
 }
 
diff --git a/tests/check/main/rtpconference.c b/tests/check/main/rtpconference.c
index c066086..e9fe2e0 100644
--- a/tests/check/main/rtpconference.c
+++ b/tests/check/main/rtpconference.c
@@ -402,11 +402,12 @@ set_initial_codecs (
 }
 
 
-GST_START_TEST (test_rtpconference_simple)
+static void
+simple_test (int in_count)
 {
   int i, j;
 
-  count = 2;
+  count = in_count;
 
   loop = g_main_loop_new (NULL, FALSE);
 
@@ -414,8 +415,10 @@ GST_START_TEST (test_rtpconference_simple)
 
   for (i = 0; i < count; i++)
   {
-    dats[i] = setup_simple_conference (i, "fsrtpconference",
-        "tester at TesterTop3");
+    gchar *tmp = g_strdup_printf ("tester%d at TesterTop3", i);
+    dats[i] = setup_simple_conference (i, "fsrtpconference", tmp);
+    g_free (tmp);
+
     rtpconference_simple_connect_signals (dats[i]);
     g_idle_add (_start_pipeline, dats[i]);
 
@@ -455,6 +458,21 @@ GST_START_TEST (test_rtpconference_simple)
 
   g_main_loop_unref (loop);
 }
+
+
+
+GST_START_TEST (test_rtpconference_two_way)
+{
+  simple_test (2);
+}
+GST_END_TEST;
+
+
+
+GST_START_TEST (test_rtpconference_three_way)
+{
+  simple_test (3);
+}
 GST_END_TEST;
 
 
@@ -477,9 +495,15 @@ fsrtpconference_suite (void)
   suite_add_tcase (s, tc_chain);
 
 
-  tc_chain = tcase_create ("fsrtpconfence_simple");
+  tc_chain = tcase_create ("fsrtpconfence_two_way");
+  tcase_set_timeout (tc_chain, 10);
+  tcase_add_test (tc_chain, test_rtpconference_two_way);
+  suite_add_tcase (s, tc_chain);
+
+
+  tc_chain = tcase_create ("fsrtpconfence_three_way");
   tcase_set_timeout (tc_chain, 10);
-  tcase_add_test (tc_chain, test_rtpconference_simple);
+  tcase_add_test (tc_chain, test_rtpconference_three_way);
   suite_add_tcase (s, tc_chain);
 
 
-- 
1.5.6.5