isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-10 10:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

test-runner: represent the guard window as '|' for assert_stacking

Browse Source 
Allow putting '|' into the list of windows for assert_stacking to
represent the position of the guard window. Not present is the same
as at the beginning (bottom) of the list.

https://bugzilla.gnome.org/show_bug.cgi?id=737233
This commit is contained in:
Owen W. Taylor 2014-09-24 16:07:11 -04:00
parent 74c37d49c4
commit 7616881afa
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tests/README
View File

@ -80,7 +80,10 @@ wait
assert_stacking <client-id>/<window-id> <client-id>/<window-id> ... assert_stacking <client-id>/<window-id> <client-id>/<window-id> ...
Assert that the list of client windows known to Mutter is as given and in Assert that the list of client windows known to Mutter is as given and in
the given order, bottom to top. the given order, bottom to top. The character '|' can be present in the
list of windows to indicate the guard window that separates hidden and
visible windows. If '|' isn't present, the guard window is asserted to
be below all client windows.
This function also queries the X server stack and verifies that Mutter's This function also queries the X server stack and verifies that Mutter's
expectation of the X server stack matches reality. expectation of the X server stack matches reality.

2
src/tests/stacking/override-redirect.metatest
View File

@ -12,7 +12,7 @@ assert_stacking 1/1 1/2
lower 1/2 lower 1/2
wait wait
assert_stacking 1/2 1/1 assert_stacking 1/2 | 1/1
raise 1/2 raise 1/2
wait wait

17
src/tests/test-runner.c
View File

@ -610,6 +610,13 @@ test_case_assert_stacking (TestCase *test,
else else
g_string_append_printf (stack_string, "(%s)", window->title); g_string_append_printf (stack_string, "(%s)", window->title);
} }
else if (windows[i] == display->screen->guard_window)
{
if (stack_string->len > 0)
g_string_append_c (stack_string, ' ');
g_string_append_c (stack_string, '|');
}
} }
for (i = 0; i < n_expected_windows; i++) for (i = 0; i < n_expected_windows; i++)
@ -620,6 +627,16 @@ test_case_assert_stacking (TestCase *test,
g_string_append (expected_string, expected_windows[i]); g_string_append (expected_string, expected_windows[i]);
} }
/* Don't require '| ' as a prefix if there are no hidden windows - we
* remove the prefix from the actual string instead of adding it to the
* expected string for clarity of the error message
*/
if (index (expected_string->str, '|') == NULL && stack_string->str[0] == '|')
{
g_string_erase (stack_string,
0, stack_string->str[1] == ' ' ? 2 : 1);
}
if (strcmp (expected_string->str, stack_string->str) != 0) if (strcmp (expected_string->str, stack_string->str) != 0)
{ {
g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED, g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED,