diff --git a/src/tests/meson.build b/src/tests/meson.build index 92d110375ee3f532ccb772f3bcdb0c4aa54f3934..77ab3b5d6d5e4a18118cff79b3b526c057c2d4e7 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -149,6 +149,7 @@ stacking_tests = [ 'basic-wayland', 'client-side-decorated', 'closed-transient', + 'closed-transient-no-default-focus', 'closed-transient-no-input-no-take-focus-parent', 'closed-transient-no-input-no-take-focus-parents', 'closed-transient-no-input-parent', diff --git a/src/tests/stacking/closed-transient-no-default-focus.metatest b/src/tests/stacking/closed-transient-no-default-focus.metatest new file mode 100644 index 0000000000000000000000000000000000000000..a2db12d5bac6a5c998ef3b198549c10fcfb8f878 --- /dev/null +++ b/src/tests/stacking/closed-transient-no-default-focus.metatest @@ -0,0 +1,29 @@ +new_client 1 x11 +create 1/1 +accept_focus 1/1 false +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +show 1/3 + +wait +assert_focused 1/3 +assert_stacking 1/1 1/2 1/3 + +destroy 1/3 +wait + +assert_focused none +assert_stacking 1/1 1/2 + +sleep 150 +wait + +assert_focused none +assert_stacking 1/1 1/2 diff --git a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest index 75a17e4e53ce66f5cd411904dfe2606e3303c5dd..90a65e6597c41d9da63739be723ccd65447e2987 100644 --- a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest +++ b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest @@ -22,7 +22,6 @@ assert_stacking 2/1 1/1 1/2 1/3 destroy 1/3 wait -assert_focused none assert_stacking 2/1 1/1 1/2 activate 2/1 diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest index 1fe00d7bfc3c7562ee58b5f8e429687f2b4f588f..5c2be11fba58cad42426bc8572cfdea05c83f621 100644 --- a/src/tests/stacking/closed-transient-no-input-parent.metatest +++ b/src/tests/stacking/closed-transient-no-input-parent.metatest @@ -22,7 +22,6 @@ assert_stacking 2/1 1/1 1/2 1/3 destroy 1/3 wait -assert_focused none assert_stacking 2/1 1/1 1/2 sleep 150 diff --git a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest index 2131771330fcc6ce718b2d901bb05b6cfa435177..e361fbdf6ad190452b4f32867086893102f5621d 100644 --- a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest +++ b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest @@ -32,7 +32,6 @@ assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 destroy 1/5 wait -assert_focused none assert_stacking 0/1 1/1 1/2 1/3 1/4 destroy 1/2 diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest index dcba70eba5807705b75c03ec736ecc7153576a37..365f6f444d6d4bbbecb0376e25a746a6e9e2e0ff 100644 --- a/src/tests/stacking/closed-transient-no-input-parents.metatest +++ b/src/tests/stacking/closed-transient-no-input-parents.metatest @@ -32,7 +32,6 @@ assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 destroy 1/5 wait -assert_focused none assert_stacking 0/1 1/1 1/2 1/3 1/4 sleep 600