Merge branch 'release-4.16.1'

[i3/i3] / testcases / t / 205-ipc-windows.t

diff --git a/testcases/t/205-ipc-windows.t b/testcases/t/205-ipc-windows.t
index e3b7196cc322214ecf12dc1b317cdc2a5bb8e32a..bafd155f6afeecf055bd0efc5579ad667c8ee174 100644 (file)
--- a/testcases/t/205-ipc-windows.t
+++ b/testcases/t/205-ipc-windows.t
@@ -2,13 +2,13 @@
 # vim:ts=4:sw=4:expandtab
 #
 # Please read the following documents before working on tests:
-# • http://build.i3wm.org/docs/testsuite.html
+# • https://build.i3wm.org/docs/testsuite.html
 #   (or docs/testsuite)
 #
-# • http://build.i3wm.org/docs/lib-i3test.html
+# • https://build.i3wm.org/docs/lib-i3test.html
 #   (alternatively: perldoc ./testcases/lib/i3test.pm)
 #
-# • http://build.i3wm.org/docs/ipc.html
+# • https://build.i3wm.org/docs/ipc.html
 #   (or docs/ipc)
 #
 # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
@@ -16,28 +16,15 @@
 
 use i3test;
 
-my $i3 = i3(get_socket_path());
-$i3->connect()->recv;
-
-################################
-# Window event
-################################
-
-# Events
-
 my $new = AnyEvent->condvar;
-$i3->subscribe({
-    window => sub {
-        my ($event) = @_;
-        $new->send($event->{change} eq 'new');
-    }
-})->recv;
-
-open_window;
+my $focus = AnyEvent->condvar;
 
-my $t;
-$t = AnyEvent->timer(after => 0.5, cb => sub { $new->send(0); });
+my @events = events_for(
+    sub { open_window },
+    'window');
 
-ok($new->recv, 'Window "new" event received');
+is(scalar @events, 2, 'Received 2 events');
+is($events[0]->{container}->{focused}, 0, 'Window "new" event received');
+is($events[1]->{container}->{focused}, 1, 'Window "focus" event received');
 
 done_testing;