Merge branch 'master' into next

[i3/i3] / testcases / t / 35-floating-focus.t

diff --git a/testcases/t/35-floating-focus.t b/testcases/t/35-floating-focus.t
index 6adad246292a50ae06b01574523dc9f36c1a1b2c..4c5b562ff12ef21a40ca6df520baaf25bcdffaf6 100644 (file)
--- a/testcases/t/35-floating-focus.t
+++ b/testcases/t/35-floating-focus.t
@@ -13,8 +13,8 @@ my $tmp = fresh_workspace;
 # 1: see if focus stays the same when toggling tiling/floating mode
 #############################################################################
 
-my $first = open_standard_window($x);
-my $second = open_standard_window($x);
+my $first = open_window($x);
+my $second = open_window($x);
 
 is($x->input_focus, $second->id, 'second window focused');
 
@@ -30,9 +30,9 @@ is($x->input_focus, $second->id, 'second window still focused after mode toggle'
 
 $tmp = fresh_workspace;
 
-$first = open_standard_window($x);    # window 2
-$second = open_standard_window($x);   # window 3
-my $third = open_standard_window($x); # window 4
+$first = open_window($x);    # window 2
+$second = open_window($x);   # window 3
+my $third = open_window($x); # window 4
 
 is($x->input_focus, $third->id, 'last container focused');
 
@@ -40,6 +40,8 @@ cmd 'floating enable';
 
 cmd '[id="' . $second->id . '"] focus';
 
+sync_with_i3($x);
+
 is($x->input_focus, $second->id, 'second con focused');
 
 cmd 'floating enable';
@@ -47,7 +49,8 @@ cmd 'floating enable';
 # now kill the third one (it's floating). focus should stay unchanged
 cmd '[id="' . $third->id . '"] kill';
 
-sleep 0.25;
+# TODO: wait for unmapnotify
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second con still focused after killing third');
 
@@ -59,9 +62,9 @@ is($x->input_focus, $second->id, 'second con still focused after killing third')
 
 $tmp = fresh_workspace;
 
-$first = open_standard_window($x, '#ff0000');    # window 5
-$second = open_standard_window($x, '#00ff00');   # window 6
-my $third = open_standard_window($x, '#0000ff'); # window 7
+$first = open_window($x, '#ff0000');    # window 5
+$second = open_window($x, '#00ff00');   # window 6
+my $third = open_window($x, '#0000ff'); # window 7
 
 is($x->input_focus, $third->id, 'last container focused');
 
@@ -69,6 +72,8 @@ cmd 'floating enable';
 
 cmd '[id="' . $second->id . '"] focus';
 
+sync_with_i3($x);
+
 is($x->input_focus, $second->id, 'second con focused');
 
 cmd 'floating enable';
@@ -77,13 +82,14 @@ cmd 'floating enable';
 # also floating
 cmd 'kill';
 
-sleep 0.25;
+# TODO: wait for unmapnotify
+sync_with_i3($x);
 
 is($x->input_focus, $third->id, 'third con focused');
 
 cmd 'kill';
-
-sleep 0.25;
+# TODO: wait for unmapnotify
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'first con focused after killing all floating cons');
 
@@ -93,11 +99,11 @@ is($x->input_focus, $first->id, 'first con focused after killing all floating co
 
 $tmp = fresh_workspace;
 
-$first = open_standard_window($x, '#ff0000');    # window 5
+$first = open_window($x, { background_color => '#ff0000' });    # window 5
 cmd 'split v';
 cmd 'layout stacked';
-$second = open_standard_window($x, '#00ff00');   # window 6
-$third = open_standard_window($x, '#0000ff'); # window 7
+$second = open_window($x, { background_color => '#00ff00' });   # window 6
+$third = open_window($x, { background_color => '#0000ff' }); # window 7
 
 is($x->input_focus, $third->id, 'last container focused');
 
@@ -105,23 +111,26 @@ cmd 'floating enable';
 
 cmd '[id="' . $second->id . '"] focus';
 
+sync_with_i3($x);
+
 is($x->input_focus, $second->id, 'second con focused');
 
 cmd 'floating enable';
 
-sleep 0.5;
+sync_with_i3($x);
 
 # now kill the second one. focus should fall back to the third one, which is
 # also floating
 cmd 'kill';
 
-sleep 0.25;
+# TODO: wait for unmapnotify
+sync_with_i3($x);
 
-is($x->input_focus, $third->id, 'second con focused');
+is($x->input_focus, $third->id, 'third con focused');
 
 cmd 'kill';
-
-sleep 0.25;
+# TODO: wait for unmapnotify
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'first con focused after killing all floating cons');
 
@@ -131,8 +140,10 @@ is($x->input_focus, $first->id, 'first con focused after killing all floating co
 
 $tmp = fresh_workspace;
 
-$first = open_standard_window($x, '#ff0000');    # window 8
-$second = open_standard_window($x, '#00ff00');   # window 9
+$first = open_window($x, { background_color => '#ff0000' });    # window 8
+$second = open_window($x, { background_color => '#00ff00' });   # window 9
+
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second container focused');
 
@@ -142,31 +153,31 @@ is($x->input_focus, $second->id, 'second container focused');
 
 cmd 'focus tiling';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'first (tiling) container focused');
 
 cmd 'focus floating';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second (floating) container focused');
 
 cmd 'focus floating';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second (floating) container still focused');
 
 cmd 'focus mode_toggle';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'first (tiling) container focused');
 
 cmd 'focus mode_toggle';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second (floating) container focused');
 
@@ -176,39 +187,41 @@ is($x->input_focus, $second->id, 'second (floating) container focused');
 
 $tmp = fresh_workspace;
 
-$first = open_standard_window($x, '#ff0000', 1);    # window 10
-$second = open_standard_window($x, '#00ff00', 1);   # window 11
-$third = open_standard_window($x, '#0000ff', 1);   # window 12
+$first = open_floating_window($x, { background_color => '#ff0000' });# window 10
+$second = open_floating_window($x, { background_color => '#00ff00' }); # window 11
+$third = open_floating_window($x, { background_color => '#0000ff' }); # window 12
+
+sync_with_i3($x);
 
 is($x->input_focus, $third->id, 'third container focused');
 
 cmd 'focus left';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'second container focused');
 
 cmd 'focus left';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'first container focused');
 
 cmd 'focus left';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $third->id, 'focus wrapped to third container');
 
 cmd 'focus right';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $first->id, 'focus wrapped to first container');
 
 cmd 'focus right';
 
-sleep 0.25;
+sync_with_i3($x);
 
 is($x->input_focus, $second->id, 'focus on second container');