*.gcno
testcases/testsuite-*
testcases/latest
+testcases/Makefile
*.output
*.tab.*
*.yy.c
'AnyEvent' => 0,
'AnyEvent::I3' => '0.09',
'X11::XCB' => '0.03',
- 'Test::Most' => 0,
- 'Test::Deep' => 0,
- 'EV' => 0,
- 'Inline' => 0,
+ 'Inline' => 0,
},
PM => {}, # do not install any files from this directory
clean => {
use X11::XCB::Window;
use X11::XCB qw(:all);
use AnyEvent::I3;
-use EV;
use List::Util qw(first);
use Time::HiRes qw(sleep);
use Cwd qw(abs_path);
my $class = shift;
my $pkg = caller;
- my $test_most_args = @_ ? "qw(@_)" : "";
+ my $test_more_args = @_ ? "qw(@_)" : "";
local $@;
eval << "__";
package $pkg;
-use Test::Most $test_most_args;
+use Test::More $test_more_args;
use Data::Dumper;
use AnyEvent::I3;
use Time::HiRes qw(sleep);
-use Test::Deep qw(eq_deeply cmp_deeply);
__
$tester->bail_out("$@") if $@;
feature->import(":5.10");
my $cv = AE::cv;
- my $prep = EV::prepare sub {
- $x->flush;
- };
+ $x->flush;
+
+ # unfortunately, there is no constant for this
+ my $ae_read = 0;
- my $check = EV::check sub {
+ my $guard = AE::io $x->get_file_descriptor, $ae_read, sub {
while (defined(my $event = $x->poll_for_event)) {
if ($cb->($event)) {
$cv->send(1);
}
};
- my $watcher = EV::io $x->get_file_descriptor, EV::READ, sub {
- # do nothing, we only need this watcher so that EV picks up the events
- };
-
# Trigger timeout after $timeout seconds (can be fractional)
my $t = AE::timer $timeout, 0, sub { warn "timeout ($timeout secs)"; $cv->send(0) };
my $result = $cv->recv;
undef $t;
+ undef $guard;
return $result;
}
wait_for_event 2, sub {
$_[0]->{response_type} == UNMAP_NOTIFY # and $_[0]->{window} == $id
};
- sync_with_i3($x);
+ sync_with_i3();
}
#
$window->map;
wait_for_map($window);
- # We sync with i3 here to make sure $x->input_focus is updated.
- sync_with_i3($x);
return $window;
}
# Thin wrapper around open_window which sets window_type to
# _NET_WM_WINDOW_TYPE_UTILITY to make the window floating.
sub open_floating_window {
- my ($x, $args) = @_;
+ my ($args) = @_;
my %args = ($args ? %$args : ());
$args{window_type} = $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY');
# See also docs/testsuite for a long explanation
#
sub sync_with_i3 {
- my ($x) = @_;
-
# Since we need a (mapped) window for receiving a ClientMessage, we create
# one on the first call of sync_with_i3. It will be re-used in all
# subsequent calls.
sub input_focus {
my $self = shift;
- i3test::sync_with_i3($self);
+ i3test::sync_with_i3();
return $self->SUPER::input_focus(@_);
}
sleep(0.25);
my $new_rect = $window->rect;
-ok(!eq_deeply($new_rect, $original_rect), "Window got repositioned");
+ok(!eq_hash($new_rect, $original_rect), "Window got repositioned");
done_testing;
#
use i3test;
-my $result = sync_with_i3($x);
+my $result = sync_with_i3;
ok($result, 'syncing was successful');
done_testing;
# Switch to another workspace
fresh_workspace;
-sync_with_i3($x);
+sync_with_i3;
my $new_focus = $x->input_focus;
isnt($focus, $new_focus, "Focus changed");
wait_for_map $window;
cmd 'floating enable';
-sync_with_i3($x);
+sync_with_i3;
($absolute, $top) = $window->rect;
cmd 'open';
my $new_rect = $window->rect;
-ok(!eq_deeply($new_rect, $original_rect), "Window got repositioned");
+ok(!eq_hash($new_rect, $original_rect), "Window got repositioned");
$original_rect = $new_rect;
$window->fullscreen(1);
-sync_with_i3($x);
+sync_with_i3;
$new_rect = $window->rect;
-ok(!eq_deeply($new_rect, $original_rect), "Window got repositioned after fullscreen");
+ok(!eq_hash($new_rect, $original_rect), "Window got repositioned after fullscreen");
my $orect = $output->{rect};
my $wrect = $new_rect;
wait_for_map $window;
$new_rect = $window->rect;
-ok(!eq_deeply($new_rect, $original_rect), "Window got repositioned after fullscreen");
+ok(!eq_hash($new_rect, $original_rect), "Window got repositioned after fullscreen");
ok($window->mapped, "Window is mapped after opening it in fullscreen mode");
$wrect = $new_rect;
$swindow->map;
-sync_with_i3($x);
+sync_with_i3;
ok(!$swindow->mapped, 'window not mapped while fullscreen window active');
$new_rect = $swindow->rect;
-ok(!eq_deeply($new_rect, $original_rect), "Window got repositioned");
+ok(!eq_hash($new_rect, $original_rect), "Window got repositioned");
$swindow->fullscreen(1);
-sync_with_i3($x);
+sync_with_i3;
is(fullscreen_windows(), 1, 'amount of fullscreen windows');
$window->fullscreen(0);
-sync_with_i3($x);
+sync_with_i3;
is(fullscreen_windows(), 0, 'amount of fullscreen windows');
ok($swindow->mapped, 'window mapped after other fullscreen ended');
###########################################################################
$swindow->fullscreen(0);
-sync_with_i3($x);
+sync_with_i3;
is(fullscreen_windows(), 0, 'amount of fullscreen windows after disabling');
my $msg = shift;
cmd $msg;
- sync_with_i3 $x;
return $x->input_focus;
}
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 50, height => 40));
-sync_with_i3 $x;
+sync_with_i3;
@docked = get_dock_clients('top');
is(@docked, 1, 'one dock client found');
my $focus = $x->input_focus;
# Create a floating window which is smaller than the minimum enforced size of i3
-my $window = open_floating_window($x);
+my $window = open_floating_window;
is($x->input_focus, $window->id, 'floating window focused');
my $msg = shift;
cmd $msg;
- sync_with_i3($x);
return $x->input_focus;
}
# Create a floating window and see if resizing works
#####################################################################
-my $window = open_floating_window($x);
+my $window = open_floating_window;
# See if configurerequests cause window movements (they should not)
my ($a, $t) = $window->rect;
$window->rect(X11::XCB::Rect->new(x => $a->x, y => $a->y, width => $a->width, height => $a->height));
-sync_with_i3($x);
+sync_with_i3;
my ($na, $nt) = $window->rect;
is_deeply($na, $a, 'Rects are equal after configurerequest');
sub test_resize {
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 100, height => 100));
- sync_with_i3($x);
+ sync_with_i3;
my ($absolute, $top) = $window->rect;
$window->rect(X11::XCB::Rect->new(x => 0, y => 0, width => 300, height => 500));
- sync_with_i3($x);
+ sync_with_i3;
($absolute, $top) = $window->rect;
# Add the urgency hint, switch to a different workspace and back again
#####################################################################
$top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
my @content = @{get_ws_content($tmp)};
@urgent = grep { $_->{urgent} } @content;
is(@urgent, 0, 'no window got the urgent flag after focusing');
$top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
@urgent = grep { $_->{urgent} } @{get_ws_content($tmp)};
is(@urgent, 0, 'no window got the urgent flag after re-setting urgency hint');
my $otmp = fresh_workspace;
$top->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
$ws = get_ws($tmp);
ok($ws->{urgent}, 'urgent flag set on workspace');
my ($abs, $rgeom) = $right->rect;
-my $child = open_floating_window($x, {
+my $child = open_floating_window({
dont_map => 1,
name => 'Child window',
});
($abs, $cgeom) = $child->rect;
cmp_ok($cgeom->x, '>=', $rgeom->x, 'Child X >= right container X');
-my $child2 = open_floating_window($x, {
+my $child2 = open_floating_window({
dont_map => 1,
name => 'Child window 2',
});
my $tree = $i3->get_tree->recv;
+# a unique value
+my $ignore = \"";
+
my $expected = {
fullscreen_mode => 0,
- nodes => ignore(),
+ nodes => $ignore,
window => undef,
name => 'root',
- orientation => ignore(),
+ orientation => $ignore,
type => 0,
- id => ignore(),
- rect => ignore(),
- window_rect => ignore(),
- geometry => ignore(),
- swallows => ignore(),
+ id => $ignore,
+ rect => $ignore,
+ window_rect => $ignore,
+ geometry => $ignore,
+ swallows => $ignore,
percent => undef,
layout => 'default',
- focus => ignore(),
+ focus => $ignore,
focused => JSON::XS::false,
urgent => JSON::XS::false,
border => 'normal',
- 'floating_nodes' => ignore(),
+ 'floating_nodes' => $ignore,
};
-cmp_deeply($tree, $expected, 'root node OK');
+# a shallow copy is sufficient, since we only ignore values at the root
+my $tree_copy = { %$tree };
+
+for (keys %$expected) {
+ my $val = $expected->{$_};
+
+ # delete unwanted keys, so we can use is_deeply()
+ if (ref($val) eq 'SCALAR' and $val == $ignore) {
+ delete $tree_copy->{$_};
+ delete $expected->{$_};
+ }
+}
+
+is_deeply($tree_copy, $expected, 'root node OK');
my @nodes = @{$tree->{nodes}};
cmd '[class="special" title="left"] kill';
-sync_with_i3($x);
+sync_with_i3;
$content = get_ws_content($tmp);
is(@{$content}, 1, 'one window still there');
######################################################################
$tmp = fresh_workspace;
-my $floatwin = open_floating_window($x);
+my $floatwin = open_floating_window;
my ($absolute_before, $top_before) = $floatwin->rect;
cmd 'move left';
$win->hints->aspect($aspect);
$x->flush;
-sync_with_i3($x);
+sync_with_i3;
my $rect = $win->rect;
my $ar = $rect->width / $rect->height;
cmd '[id="' . $second->id . '"] focus';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second con focused');
cmd 'floating enable';
cmd '[id="' . $second->id . '"] focus';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second con focused');
cmd 'floating enable';
cmd '[id="' . $second->id . '"] focus';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second con focused');
cmd 'floating enable';
-sync_with_i3($x);
+sync_with_i3;
# now kill the second one. focus should fall back to the third one, which is
# also floating
$first = open_window({ background_color => '#ff0000' }); # window 8
$second = open_window({ background_color => '#00ff00' }); # window 9
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second container focused');
cmd 'floating enable';
cmd 'focus tiling';
-sync_with_i3($x);
-
is($x->input_focus, $first->id, 'first (tiling) container focused');
cmd 'focus floating';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second (floating) container focused');
cmd 'focus floating';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second (floating) container still focused');
cmd 'focus mode_toggle';
-sync_with_i3($x);
-
is($x->input_focus, $first->id, 'first (tiling) container focused');
cmd 'focus mode_toggle';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second (floating) container focused');
#############################################################################
$tmp = fresh_workspace;
-$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);
+$first = open_floating_window({ background_color => '#ff0000' });# window 10
+$second = open_floating_window({ background_color => '#00ff00' }); # window 11
+$third = open_floating_window({ background_color => '#0000ff' }); # window 12
is($x->input_focus, $third->id, 'third container focused');
cmd 'focus left';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second container focused');
cmd 'focus left';
-sync_with_i3($x);
-
is($x->input_focus, $first->id, 'first container focused');
cmd 'focus left';
-sync_with_i3($x);
-
is($x->input_focus, $third->id, 'focus wrapped to third container');
cmd 'focus right';
-sync_with_i3($x);
-
is($x->input_focus, $first->id, 'focus wrapped to first container');
cmd 'focus right';
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'focus on second container');
done_testing;
ok(workspace_exists($tmp), "workspace $tmp exists");
# Create a floating window which is smaller than the minimum enforced size of i3
-my $window = open_floating_window($x);
+my $window = open_floating_window;
ok($window->mapped, 'Window is mapped');
# switch to a different workspace, see if the window is still mapped?
#############################################################################
# Create a floating window which is smaller than the minimum enforced size of i3
-my $window = open_floating_window($x);
+my $window = open_floating_window;
ok($window->mapped, 'Window is mapped');
# switch to a different workspace, see if the window is still mapped?
my $otmp = fresh_workspace;
-sync_with_i3($x);
+sync_with_i3;
ok(!$window->mapped, 'Window is not mapped after switching ws');
#############################################################################
# Create a floating window
-my $window = open_floating_window($x);
+my $window = open_floating_window;
ok($window->mapped, 'Window is mapped');
my $ws = get_ws($tmp);
is(@{$ws->{nodes}}, 1, 'one tiling node (stacked con)');
# Create a floating window
-$window = open_floating_window($x);
+$window = open_floating_window;
ok($window->mapped, 'Window is mapped');
$ws = get_ws($tmp);
my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
my @sorted = sort @nums;
- cmp_deeply(\@nums, \@sorted, $msg);
+ is_deeply(\@nums, \@sorted, $msg);
}
check_order('workspace order alright before testing');
my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
my @sorted = sort @nums;
- cmp_deeply(\@nums, \@sorted, $msg);
+ is_deeply(\@nums, \@sorted, $msg);
}
my $tmp = fresh_workspace;
my $mid = open_window;
my $right = open_window;
-sync_with_i3($x);
-
diag("left = " . $left->id . ", mid = " . $mid->id . ", right = " . $right->id);
is($x->input_focus, $right->id, 'Right window focused');
my $top = open_window;
my $bottom = open_window;
-sync_with_i3($x);
-
diag("top = " . $top->id . ", bottom = " . $bottom->id);
is($x->input_focus, $bottom->id, 'Bottom window focused');
#############################################################################
# Create a floating window
-my $window = open_floating_window($x);
+my $window = open_floating_window;
ok($window->mapped, 'Window is mapped');
($nodes, $focus) = get_ws_content($tmp);
cmp_ok($absolute->{height}, '>', 150, 'i3 raised the height');
cmd 'floating toggle';
-sync_with_i3($x);
+sync_with_i3;
($absolute, $top) = $window->rect;
$third->map;
-sync_with_i3 $x;
+sync_with_i3;
diag("third = " . $third->id);
cmd "move workspace $tmp2";
# verify that the third window has the focus
-
-sync_with_i3($x);
-
is($x->input_focus, $third->id, 'third window focused');
done_testing;
$window->add_hint('urgency');
-sync_with_i3($x);
+sync_with_i3;
does_i3_live;
my $window = open_window;
-sync_with_i3($x);
-
is($window->state, ICCCM_WM_STATE_NORMAL, 'WM_STATE normal');
$window->unmap;
my $first = open_window;
my $second = open_window;
- sync_with_i3 $x;
-
is($x->input_focus, $second->id, 'second window focused');
ok(@{get_ws_content($tmp)} == 2, 'two containers opened');
is($content[0]->{border}, 'normal', 'normal border');
$window->name('special borderless title');
-sync_with_i3 $x;
+sync_with_i3;
@content = @{get_ws_content($tmp)};
is($content[0]->{border}, 'none', 'no border');
$window->name('special title');
-sync_with_i3 $x;
+sync_with_i3;
cmd 'border normal';
is($content[0]->{border}, 'normal', 'border reset to normal');
$window->name('special borderless title');
-sync_with_i3 $x;
+sync_with_i3;
@content = @{get_ws_content($tmp)};
is($content[0]->{border}, 'normal', 'still normal border');
$window->destroy;
# give i3 a chance to delete the window from its tree
-sync_with_i3 $x;
+sync_with_i3;
@content = @{get_ws_content($tmp)};
cmp_ok(@content, '==', 0, 'no nodes on this workspace now');
$x->flush;
-sync_with_i3 $x;
+sync_with_i3;
@content = @{get_ws_content($tmp)};
cmp_ok(@content, '==', 1, 'one node on this workspace now');
# We use sync_with_i3 instead of wait_for_map here because i3 will not actually
# map the window -- it will be assigned to a different workspace and will only
# be mapped once you switch to that workspace
-sync_with_i3 $x;
+sync_with_i3;
ok(@{get_ws_content($tmp)} == 0, 'still no containers');
ok(@{get_ws_content('targetws')} == 2, 'two containers on targetws');
my $first = open_window;
my $second = open_window;
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second window focused');
my @content = @{get_ws_content($tmp)};
ok(@content == 2, 'two containers opened');
$first = open_window;
$second = open_window;
-sync_with_i3($x);
-
is($x->input_focus, $second->id, 'second window focused');
@content = @{get_ws_content($tmp)};
ok(@content == 1, 'one con at workspace level');
$third = open_window;
-sync_with_i3($x);
-
is($x->input_focus, $third->id, 'third window focused');
cmd 'focus left';
my $pid = launch_with_config($config);
my @names = @{get_workspace_names()};
-cmp_deeply(\@names, [ '1' ], 'i3 starts on workspace 1 without any configuration');
+is_deeply(\@names, [ '1' ], 'i3 starts on workspace 1 without any configuration');
exit_gracefully($pid);
$pid = launch_with_config($config);
@names = @{get_workspace_names()};
-cmp_deeply(\@names, [ 'foobar' ], 'i3 starts on named workspace foobar');
+is_deeply(\@names, [ 'foobar' ], 'i3 starts on named workspace foobar');
exit_gracefully($pid);
$pid = launch_with_config($config);
@names = @{get_workspace_names()};
-cmp_deeply(\@names, [ 'foobar' ], 'i3 starts on named workspace foobar');
+is_deeply(\@names, [ 'foobar' ], 'i3 starts on named workspace foobar');
exit_gracefully($pid);
my $tmp = fresh_workspace;
my $marks = get_marks();
-cmp_deeply($marks, [], 'no marks set so far');
+is_deeply($marks, [], 'no marks set so far');
##############################################################
# 2: check that setting a mark is reflected in the get_marks reply
cmd 'open';
cmd 'mark foo';
-cmp_deeply(get_marks(), [ 'foo' ], 'mark foo set');
+is_deeply(get_marks(), [ 'foo' ], 'mark foo set');
##############################################################
# 3: check that the mark is gone after killing the container
cmd 'kill';
-cmp_deeply(get_marks(), [ ], 'mark gone');
+is_deeply(get_marks(), [ ], 'mark gone');
##############################################################
# 4: check that duplicate marks are included twice in the get_marks reply
cmd 'open';
cmd 'mark bar';
-cmp_deeply(get_marks(), [ 'bar', 'bar' ], 'duplicate mark found twice');
+is_deeply(get_marks(), [ 'bar', 'bar' ], 'duplicate mark found twice');
done_testing;
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
-$first = open_floating_window($x);
+$first = open_floating_window;
my $wscontent = get_ws($tmp);
my @floating = @{$wscontent->{floating_nodes}};
ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
-$first = open_floating_window($x);
+$first = open_floating_window;
$wscontent = get_ws($tmp);
@floating = @{$wscontent->{floating_nodes}};
# We don’t use wait_for_map because the window will not get mapped -- it is on
# a different workspace.
# We sync with i3 here to make sure $x->input_focus is updated.
-sync_with_i3($x);
+sync_with_i3;
is(@{get_ws_content($second_ws)}, 0, 'still no containers on the second workspace');
is(@{get_ws_content($first_ws)}, 1, 'one container on the first workspace');
$win = open_window({ dont_map => 1, client_leader => $leader });
$win->map;
-sync_with_i3($x);
+sync_with_i3;
is(@{get_ws_content($second_ws)}, 0, 'still no containers on the second workspace');
is(@{get_ws_content($first_ws)}, 2, 'two containers on the first workspace');
######################################################################
complete_startup();
-sync_with_i3($x);
+sync_with_i3;
my $otherwin = open_window;
is(@{get_ws_content($second_ws)}, 1, 'one container on the second workspace');
projects / i3 / i3 / commitdiff