Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port display tests to g_test_trap_subprocess

Browse Source
This commit is contained in:
Matthias Clasen
2013-05-29 21:11:14 -04:00
parent 0d768ee8a8
commit c9890d6cbb
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
testsuite/gdk/display.c
View File

@@ -2,62 +2,64 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
static void
test_unset_display_subprocess1 (void)
{
GdkDisplayManager *manager;
g_unsetenv ("DISPLAY");
g_assert (!gdk_init_check (NULL, NULL));
manager = gdk_display_manager_get ();
g_assert (manager != NULL);
g_assert (gdk_display_manager_get_default_display (manager) == NULL);
}
static void
test_unset_display_subprocess2 (void)
{
g_unsetenv ("DISPLAY");
gdk_init (NULL, NULL);
}
static void static void
test_unset_display (void) test_unset_display (void)
{ {
if (g_test_trap_fork (0, 0))//G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) g_test_trap_subprocess ("/display/unset-display/subprocess/1", 0, 0);
{
GdkDisplayManager *manager;
g_unsetenv ("DISPLAY");
g_assert (!gdk_init_check (NULL, NULL));
manager = gdk_display_manager_get ();
g_assert (manager != NULL);
g_assert (gdk_display_manager_get_default_display (manager) == NULL);
exit (0);
}
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) g_test_trap_subprocess ("/display/unset-display/subprocess/2", 0, 0);
{
g_unsetenv ("DISPLAY");
gdk_init (NULL, NULL);
exit (0);
}
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*cannot open display*"); g_test_trap_assert_stderr ("*cannot open display*");
} }
static void
test_bad_display_subprocess1 (void)
{
GdkDisplayManager *manager;
g_setenv ("DISPLAY", "poo", TRUE);
g_assert (!gdk_init_check (NULL, NULL));
manager = gdk_display_manager_get ();
g_assert (manager != NULL);
g_assert (gdk_display_manager_get_default_display (manager) == NULL);
}
static void
test_bad_display_subprocess2 (void)
{
g_setenv ("DISPLAY", "poo", TRUE);
gdk_init (NULL, NULL);
}
static void static void
test_bad_display (void) test_bad_display (void)
{ {
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) g_test_trap_subprocess ("/display/bad-display/subprocess/1", 0, 0);
{
GdkDisplayManager *manager;
g_setenv ("DISPLAY", "poo", TRUE);
g_assert (!gdk_init_check (NULL, NULL));
manager = gdk_display_manager_get ();
g_assert (manager != NULL);
g_assert (gdk_display_manager_get_default_display (manager) == NULL);
exit (0);
}
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR)) g_test_trap_subprocess ("/display/bad-display/subprocess/2", 0, 0);
{
g_setenv ("DISPLAY", "poo", TRUE);
gdk_init (NULL, NULL);
exit (0);
}
g_test_trap_assert_failed (); g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*cannot open display*"); g_test_trap_assert_stderr ("*cannot open display*");
} }
@@ -68,7 +70,11 @@ main (int argc, char *argv[])
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/display/unset-display", test_unset_display); g_test_add_func ("/display/unset-display", test_unset_display);
g_test_add_func ("/display/unset-display/subprocess/1", test_unset_display_subprocess1);
g_test_add_func ("/display/unset-display/subprocess/2", test_unset_display_subprocess2);
g_test_add_func ("/display/bad-display", test_bad_display); 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);
return g_test_run (); return g_test_run ();
} }