[gtksourceview] test-languagemanager: don't use g_test_trap_fork() (deprecated)

[Sébastien Wilmet <swilmet src gnome org>]

commit 7620805087b9a820fd2fdfc099be3de8ef5b1e99
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jun 28 15:06:46 2013 +0200

    test-languagemanager: don't use g_test_trap_fork() (deprecated)

 README                       |    2 +-
 configure.ac                 |    2 +-
 tests/test-languagemanager.c |   60 +++++++++++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 20 deletions(-)
---
diff --git a/README b/README
index c12ae1e..f92930d 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ All future contributions to the project must be LGPL-licensed.
 Installation
 ============
 
-GtkSourceView requires glib-2.34.x, GTK+-3.8.x and libxml2 2.6.x.
+GtkSourceView requires glib >= 2.37.1, GTK+ >= 3.8 and libxml2 >= 2.6.
 
 Simple install procedure:
 
diff --git a/configure.ac b/configure.ac
index 4d49e1c..27e9ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ LT_INIT([disable-static])
 AC_CHECK_HEADERS([unistd.h])
 
 # Dependencies
-GLIB_REQUIRED_VERSION=2.34.0
+GLIB_REQUIRED_VERSION=2.37.1
 GTK_REQUIRED_VERSION=3.8.0
 LIBXML_REQUIRED_VERSION=2.6.0
 GLADE_UI_REQUIRED=3.9
diff --git a/tests/test-languagemanager.c b/tests/test-languagemanager.c
index 5a62217..2515fc4 100644
--- a/tests/test-languagemanager.c
+++ b/tests/test-languagemanager.c
@@ -54,6 +54,38 @@ test_get_language (void)
 }
 
 static void
+test_guess_language_null_null (void)
+{
+       GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+       gtk_source_language_manager_guess_language (lm, NULL, NULL);
+}
+
+static void
+test_guess_language_empty_null (void)
+{
+       GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+       gtk_source_language_manager_guess_language (lm, "", NULL);
+}
+
+static void
+test_guess_language_null_empty (void)
+{
+       GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+       gtk_source_language_manager_guess_language (lm, NULL, "");
+}
+
+static void
+test_guess_language_empty_empty (void)
+{
+       GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+
+       gtk_source_language_manager_guess_language (lm, "", "");
+}
+
+static void
 test_guess_language (void)
 {
        GtkSourceLanguageManager *lm;
@@ -61,28 +93,16 @@ test_guess_language (void)
 
        lm = gtk_source_language_manager_get_default ();
 
-       if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-       {
-               l = gtk_source_language_manager_guess_language (lm, NULL, NULL);
-       }
+       g_test_trap_subprocess ("/LanguageManager/guess-language/subprocess/null_null", 0, 0);
        g_test_trap_assert_failed ();
 
-       if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-       {
-               l = gtk_source_language_manager_guess_language (lm, "", NULL);
-       }
+       g_test_trap_subprocess ("/LanguageManager/guess-language/subprocess/empty_null", 0, 0);
        g_test_trap_assert_failed ();
 
-       if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-       {
-               l = gtk_source_language_manager_guess_language (lm, NULL, "");
-       }
+       g_test_trap_subprocess ("/LanguageManager/guess-language/subprocess/null_empty", 0, 0);
        g_test_trap_assert_failed ();
 
-       if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-       {
-               l = gtk_source_language_manager_guess_language (lm, "", "");
-       }
+       g_test_trap_subprocess ("/LanguageManager/guess-language/subprocess/empty_empty", 0, 0);
        g_test_trap_assert_failed ();
 
        l = gtk_source_language_manager_guess_language (lm, "foo.abcdef", NULL);
@@ -111,10 +131,10 @@ test_guess_language (void)
 
        l = gtk_source_language_manager_guess_language (lm, "foo.c", "text/x-csrc");
        g_assert_cmpstr (gtk_source_language_get_id (l), ==, "c");
-       
+
        l = gtk_source_language_manager_guess_language (lm, "foo.mo", "text/x-modelica");
        g_assert_cmpstr (gtk_source_language_get_id (l), ==, "modelica");
-       
+
        l = gtk_source_language_manager_guess_language (lm, "foo.mo", "");
        g_assert_cmpstr (gtk_source_language_get_id (l), ==, "modelica");
 
@@ -137,6 +157,10 @@ main (int argc, char** argv)
        g_test_add_func ("/LanguageManager/get-default", test_get_default);
        g_test_add_func ("/LanguageManager/get-language", test_get_language);
        g_test_add_func ("/LanguageManager/guess-language", test_guess_language);
+       g_test_add_func ("/LanguageManager/guess-language/subprocess/null_null", 
test_guess_language_null_null);
+       g_test_add_func ("/LanguageManager/guess-language/subprocess/empty_null", 
test_guess_language_empty_null);
+       g_test_add_func ("/LanguageManager/guess-language/subprocess/null_empty", 
test_guess_language_null_empty);
+       g_test_add_func ("/LanguageManager/guess-language/subprocess/empty_empty", 
test_guess_language_empty_empty);
 
        return g_test_run();
 }