Merge pull request #3435 from vivien/i3-msg/subscribe

[i3/i3] / testcases / t / 227-ipc-workspace-empty.t

diff --git a/testcases/t/227-ipc-workspace-empty.t b/testcases/t/227-ipc-workspace-empty.t
index fe8e03c02b01f9cb37c335fd2097a0e29ac8547c..b1f517ef5e4eb67aed9cf44044b02c04a31686db 100644 (file)
--- a/testcases/t/227-ipc-workspace-empty.t
+++ b/testcases/t/227-ipc-workspace-empty.t
@@ -18,12 +18,8 @@
 #
 use i3test;
 
-SKIP: {
-
-    skip "AnyEvent::I3 too old (need >= 0.15)", 1 if $AnyEvent::I3::VERSION < 0.15;
-
 ################################################################################
-# check that the workspace empty event is send upon workspace switch when the
+# check that the workspace empty event is sent upon workspace switch when the
 # old workspace is empty
 ################################################################################
 subtest 'Workspace empty event upon switch', sub {
@@ -35,26 +31,17 @@ subtest 'Workspace empty event upon switch', sub {
     cmd '[id="' . $w1->id . '"] kill';
 
     my $cond = AnyEvent->condvar;
-    my $client = i3(get_socket_path(0));
-    $client->connect()->recv;
-    $client->subscribe({
-        workspace => sub {
-            my ($event) = @_;
-            $cond->send($event);
-        }
-    })->recv;
-
-    cmd "workspace $ws2";
-
-    sync_with_i3;
+    my @events = events_for(
+       sub { cmd "workspace $ws2" },
+       'workspace');
 
-    my $event = $cond->recv;
-    is($event->{change}, 'empty', '"Empty" event received upon workspace switch');
-    is($event->{current}->{name}, $ws1, '"current" property should be set to the workspace con');
+    is(scalar @events, 2, 'Received 2 event');
+    is($events[1]->{change}, 'empty', '"Empty" event received upon workspace switch');
+    is($events[1]->{current}->{name}, $ws1, '"current" property should be set to the workspace con');
 };
 
 ################################################################################
-# check that no workspace empty event is send upon workspace switch if the
+# check that no workspace empty event is sent upon workspace switch if the
 # workspace is not empty
 ################################################################################
 subtest 'No workspace empty event', sub {
@@ -63,36 +50,16 @@ subtest 'No workspace empty event', sub {
     my $ws1 = fresh_workspace;
     my $w1 = open_window();
 
-    my @events;
-    my $cond = AnyEvent->condvar;
-    my $client = i3(get_socket_path(0));
-    $client->connect()->recv;
-    $client->subscribe({
-        workspace => sub {
-            my ($event) = @_;
-            push @events, $event;
-        }
-    })->recv;
-
-    # Wait for the workspace event on a new connection. Events will be delivered
-    # to older connections earlier, so by the time it arrives here, it should be
-    # in @events already.
-    my $ws_event_block_conn = i3(get_socket_path(0));
-    $ws_event_block_conn->connect()->recv;
-    $ws_event_block_conn->subscribe({ workspace => sub { $cond->send(1) }});
-
-    cmd "workspace $ws2";
+    my @events = events_for(
+       sub { cmd "workspace $ws2" },
+       'workspace');
 
-    sync_with_i3;
-
-    my @expected_events = grep { $_->{change} eq 'focus' } @events;
-    my @empty_events = grep { $_->{change} eq 'empty' } @events;
-    is(@expected_events, 1, '"Focus" event received');
-    is(@empty_events, 0, 'No "empty" events received');
+    is(scalar @events, 1, 'Received 1 event');
+    is($events[0]->{change}, 'focus', 'Event change is "focus"');
 };
 
 ################################################################################
-# check that workspace empty event is send when the last window has been closed
+# check that workspace empty event is sent when the last window has been closed
 # on invisible workspace
 ################################################################################
 subtest 'Workspace empty event upon window close', sub {
@@ -101,25 +68,16 @@ subtest 'Workspace empty event upon window close', sub {
     my $ws2 = fresh_workspace;
     my $w2 = open_window();
 
-    my $cond = AnyEvent->condvar;
-    my $client = i3(get_socket_path(0));
-    $client->connect()->recv;
-    $client->subscribe({
-        workspace => sub {
-            my ($event) = @_;
-            $cond->send($event);
-        }
-    })->recv;
-
-    cmd '[id="' . $w1->id . '"] kill';
-
-    sync_with_i3;
+    my @events = events_for(
+       sub {
+           $w1->unmap;
+           sync_with_i3;
+       },
+       'workspace');
 
-    my $event = $cond->recv;
-    is($event->{change}, 'empty', '"Empty" event received upon window close');
-    is($event->{current}->{name}, $ws1, '"current" property should be set to the workspace con');
+    is(scalar @events, 1, 'Received 1 event');
+    is($events[0]->{change}, 'empty', '"Empty" event received upon window close');
+    is($events[0]->{current}->{name}, $ws1, '"current" property should be set to the workspace con');
 };
 
-}
-
 done_testing;