applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor and improve test 514

Browse Source 
Split test 514's assertion into three assertions to make it more
explicit what is being tested, and why a run might fail.

Move critical test code out of the event handler to clarify flow and
allow a query of the actual current workspace to use in assertions.

Works around an issue which caused this test to fail spurriously because
of pointer-related quirks in the i3 test suite which would sometimes
cause i3 to open on workspace 2 (However, the test is now agnostic to
the initial workspace or output).
This commit is contained in:
Tony Crisci 2013-12-02 11:23:52 -05:00 committed by Michael Stapelberg
parent 39f15da82f
commit 18ad1fd4de
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
testcases/t/514-ipc-workspace-multi-monitor.t
View File

@ -19,6 +19,10 @@
use i3test i3_autostart => 0; use i3test i3_autostart => 0;
# Ensure the pointer is at (0, 0) so that we really start on the first
# (the left) workspace.
$x->root->warp_pointer(0, 0);
my $config = <<EOT; my $config = <<EOT;
# i3 config file (v4) # i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@ -35,7 +39,7 @@ $i3->connect()->recv;
# Workspaces requests and events # Workspaces requests and events
################################ ################################
my $focused = get_ws(focused_ws()); my $old_ws = get_ws(focused_ws);
# Events # Events
@ -46,17 +50,11 @@ $i3->subscribe({
workspace => sub { workspace => sub {
my ($event) = @_; my ($event) = @_;
if ($event->{change} eq 'focus') { if ($event->{change} eq 'focus') {
# Check that we have the old and new workspace $focus->send($event);
$focus->send(
$event->{current}->{name} == '2' &&
$event->{old}->{name} == $focused->{name}
);
} }
} }
})->recv; })->recv;
cmd 'focus output right';
my $t; my $t;
$t = AnyEvent->timer( $t = AnyEvent->timer(
after => 0.5, after => 0.5,
@ -65,7 +63,15 @@ $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);
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');
exit_gracefully($pid); exit_gracefully($pid);