testsuite: Improve test coverage

diff --git a/testsuite/gdk/display.c b/testsuite/gdk/display.c
index ca1d668f8ad9160864ab50565201ee1df18f6714..16be96db63c1069e78f70262ea73fb2b513aca0c 100644 (file)
--- a/testsuite/gdk/display.c
+++ b/testsuite/gdk/display.c
@@ -65,6 +65,23 @@ test_bad_display (void)
   g_test_trap_assert_stderr ("*Failed to open display*");
 }
 
+static void
+test_debug_help (void)
+{
+  if (g_test_subprocess ())
+    {
+      g_setenv ("GDK_DEBUG", "help", TRUE);
+
+      gtk_init_check ();
+      return;
+    }
+
+  g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_DEFAULT);
+  g_test_trap_assert_passed ();
+  g_test_trap_assert_stderr ("*Supported GDK_DEBUG values:*");
+  g_test_trap_assert_stderr ("*Multiple values can be given, separated by : or space.*");
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -78,6 +95,7 @@ main (int argc, char *argv[])
   g_test_add_func ("/display/bad-display", test_bad_display);
   g_test_add_func ("/display/bad-display/subprocess/1", test_bad_display_subprocess1);
   g_test_add_func ("/display/bad-display/subprocess/2", test_bad_display_subprocess2);
+  g_test_add_func ("/debug/help", test_debug_help);
 
   return g_test_run ();
 }

diff --git a/testsuite/gdk/displaymanager.c b/testsuite/gdk/displaymanager.c
index 89627444e786c6cf9f0a7d4fe763009b830157c4..5a8f6078295e6d1f5fff099cdc749e66fdef3314 100644 (file)
--- a/testsuite/gdk/displaymanager.c
+++ b/testsuite/gdk/displaymanager.c
@@ -40,6 +40,14 @@ test_set_default (void)
   g_assert_true (d == d2);
 }
 
+static void
+test_display_basic (void)
+{
+  GdkDisplay *d = gdk_display_get_default ();
+
+  g_assert_false (gdk_display_is_closed (d));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -48,6 +56,7 @@ main (int argc, char *argv[])
   /* Open default display */
   gdk_display_open (NULL);
 
+  g_test_add_func ("/display/basic", test_display_basic);
   g_test_add_func ("/displaymanager/basic", test_basic);
   g_test_add_func ("/displaymanager/set-default", test_set_default);