Merge pull request #2953 from CyberShadow/focus_wrapping

[i3/i3] / testcases / t / 514-ipc-workspace-multi-monitor.t

diff --git a/testcases/t/514-ipc-workspace-multi-monitor.t b/testcases/t/514-ipc-workspace-multi-monitor.t
index 360bd426ff47802766a5523a5b9f7ca4addf1fb3..e3753bec681ffffa3ac15ac2814d0c1b76e38d3c 100644 (file)
--- a/testcases/t/514-ipc-workspace-multi-monitor.t
+++ b/testcases/t/514-ipc-workspace-multi-monitor.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
@@ -17,16 +17,12 @@
 # Ticket: #990
 # Bug still in: 4.5.1-23-g82b5978
 
-use i3test i3_autostart => 0;
-
-my $config = <<EOT;
+use i3test i3_config => <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 fake-outputs 1024x768+0+0,1024x768+1024+0
 EOT
 
-my $pid = launch_with_config($config);
-
 my $i3 = i3(get_socket_path());
 
 $i3->connect()->recv;
@@ -35,7 +31,7 @@ $i3->connect()->recv;
 # Workspaces requests and events
 ################################
 
-my $focused = get_ws(focused_ws());
+my $old_ws = get_ws(focused_ws);
 
 # Events
 
@@ -46,17 +42,11 @@ $i3->subscribe({
     workspace => sub {
         my ($event) = @_;
         if ($event->{change} eq 'focus') {
-            # Check that we have the old and new workspace
-            $focus->send(
-                $event->{current}->{name} == '2' &&
-                $event->{old}->{name} == $focused->{name}
-            );
+            $focus->send($event);
         }
     }
 })->recv;
 
-cmd 'focus output right';
-
 my $t;
 $t = AnyEvent->timer(
     after => 0.5,
@@ -65,8 +55,14 @@ $t = AnyEvent->timer(
     }
 );
 
-ok($focus->recv, 'Workspace "focus" event received');
+cmd 'focus output right';
+
+my $event = $focus->recv;
+
+my $current_ws = get_ws(focused_ws);
 
-exit_gracefully($pid);
+ok($event, 'Workspace "focus" event received');
+is($event->{current}->{id}, $current_ws->{id}, 'Event gave correct current workspace');
+is($event->{old}->{id}, $old_ws->{id}, 'Event gave correct old workspace');
 
 done_testing;