Remove skipped tests. (#2305)
We simply remove these tests since they are sufficiently covered by other testcases. relates to #2289
This commit is contained in:
Ingo Bürk
Michael Stapelberg
parent
e1b3187f90
commit
ba5240d621
|
|
@ -1,96 +0,0 @@
|
||||||
#!perl
|
|
||||||
# vim:ts=4:sw=4:expandtab
|
|
||||||
#
|
|
||||||
# Please read the following documents before working on tests:
|
|
||||||
# • http://build.i3wm.org/docs/testsuite.html
|
|
||||||
# (or docs/testsuite)
|
|
||||||
#
|
|
||||||
# • http://build.i3wm.org/docs/lib-i3test.html
|
|
||||||
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
|
||||||
#
|
|
||||||
# • http://build.i3wm.org/docs/ipc.html
|
|
||||||
# (or docs/ipc)
|
|
||||||
#
|
|
||||||
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
|
||||||
# (unless you are already familiar with Perl)
|
|
||||||
#
|
|
||||||
# Beware that this test uses workspace 9 to perform some tests (it expects
|
|
||||||
# the workspace to be empty).
|
|
||||||
# TODO: skip it by default?
|
|
||||||
|
|
||||||
use i3test tests => 8;
|
|
||||||
use X11::XCB qw(:all);
|
|
||||||
use Time::HiRes qw(sleep);
|
|
||||||
|
|
||||||
BEGIN {
|
|
||||||
use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
|
|
||||||
}
|
|
||||||
|
|
||||||
SKIP: {
|
|
||||||
skip "Testcase not yet modified for new move concept", 7;
|
|
||||||
|
|
||||||
my $x = X11::XCB::Connection->new;
|
|
||||||
|
|
||||||
my $i3 = i3;
|
|
||||||
|
|
||||||
# Switch to the ninth workspace
|
|
||||||
$i3->command('9')->recv;
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Create two windows and make sure focus switching works
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
my $top = i3test::open_standard_window($x);
|
|
||||||
sleep(0.25);
|
|
||||||
my $mid = i3test::open_standard_window($x);
|
|
||||||
sleep(0.25);
|
|
||||||
my $bottom = i3test::open_standard_window($x);
|
|
||||||
sleep(0.25);
|
|
||||||
|
|
||||||
diag("top id = " . $top->id);
|
|
||||||
diag("mid id = " . $mid->id);
|
|
||||||
diag("bottom id = " . $bottom->id);
|
|
||||||
|
|
||||||
#
|
|
||||||
# Returns the input focus after sending the given command to i3 via IPC
|
|
||||||
# end sleeping for half a second to make sure i3 reacted
|
|
||||||
#
|
|
||||||
sub focus_after {
|
|
||||||
my $msg = shift;
|
|
||||||
|
|
||||||
$i3->command($msg)->recv;
|
|
||||||
return $x->input_focus;
|
|
||||||
}
|
|
||||||
|
|
||||||
my $focus = $x->input_focus;
|
|
||||||
is($focus, $bottom->id, "Latest window focused");
|
|
||||||
|
|
||||||
$focus = focus_after("ml");
|
|
||||||
is($focus, $bottom->id, "Right window still focused");
|
|
||||||
|
|
||||||
$focus = focus_after("h");
|
|
||||||
is($focus, $mid->id, "Middle window focused");
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Now move to the top window, move right, then move left again
|
|
||||||
# (e.g., does i3 remember the focus in the last container?)
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $top->id, "Top window focused");
|
|
||||||
|
|
||||||
$focus = focus_after("l");
|
|
||||||
is($focus, $bottom->id, "Right window focused");
|
|
||||||
|
|
||||||
$focus = focus_after("h");
|
|
||||||
is($focus, $top->id, "Top window focused");
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Move window cross-workspace
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
for my $cmd (qw(m12 t m13 12 13)) {
|
|
||||||
$i3->command($cmd)->recv;
|
|
||||||
}
|
|
||||||
ok(1, "Still living");
|
|
||||||
}
|
|
||||||
|
|
@ -1,144 +0,0 @@
|
||||||
#!perl
|
|
||||||
# vim:ts=4:sw=4:expandtab
|
|
||||||
#
|
|
||||||
# Please read the following documents before working on tests:
|
|
||||||
# • http://build.i3wm.org/docs/testsuite.html
|
|
||||||
# (or docs/testsuite)
|
|
||||||
#
|
|
||||||
# • http://build.i3wm.org/docs/lib-i3test.html
|
|
||||||
# (alternatively: perldoc ./testcases/lib/i3test.pm)
|
|
||||||
#
|
|
||||||
# • http://build.i3wm.org/docs/ipc.html
|
|
||||||
# (or docs/ipc)
|
|
||||||
#
|
|
||||||
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
|
|
||||||
# (unless you are already familiar with Perl)
|
|
||||||
#
|
|
||||||
# Beware that this test uses workspace 9 to perform some tests (it expects
|
|
||||||
# the workspace to be empty).
|
|
||||||
# TODO: skip it by default?
|
|
||||||
|
|
||||||
use i3test tests => 22;
|
|
||||||
use X11::XCB qw(:all);
|
|
||||||
use Time::HiRes qw(sleep);
|
|
||||||
|
|
||||||
BEGIN {
|
|
||||||
use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
|
|
||||||
}
|
|
||||||
|
|
||||||
SKIP: {
|
|
||||||
skip "stacking test not yet updated", 21;
|
|
||||||
|
|
||||||
my $x = X11::XCB::Connection->new;
|
|
||||||
|
|
||||||
my $i3 = i3;
|
|
||||||
|
|
||||||
# Switch to the ninth workspace
|
|
||||||
$i3->command('9')->recv;
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Create two windows and make sure focus switching works
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
my $top = i3test::open_standard_window($x);
|
|
||||||
my $mid = i3test::open_standard_window($x);
|
|
||||||
my $bottom = i3test::open_standard_window($x);
|
|
||||||
sleep(0.25);
|
|
||||||
|
|
||||||
diag("top id = " . $top->id);
|
|
||||||
diag("mid id = " . $mid->id);
|
|
||||||
diag("bottom id = " . $bottom->id);
|
|
||||||
|
|
||||||
#
|
|
||||||
# Returns the input focus after sending the given command to i3 via IPC
|
|
||||||
# end sleeping for half a second to make sure i3 reacted
|
|
||||||
#
|
|
||||||
sub focus_after {
|
|
||||||
my $msg = shift;
|
|
||||||
|
|
||||||
$i3->command($msg)->recv;
|
|
||||||
return $x->input_focus;
|
|
||||||
}
|
|
||||||
|
|
||||||
my $focus = $x->input_focus;
|
|
||||||
is($focus, $bottom->id, "Latest window focused");
|
|
||||||
|
|
||||||
$focus = focus_after("s");
|
|
||||||
is($focus, $bottom->id, "Last window still focused");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $mid->id, "Middle window focused");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $top->id, "Top window focused");
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Test focus wrapping
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $bottom->id, "Bottom window focused (wrapping to the top works)");
|
|
||||||
|
|
||||||
$focus = focus_after("j");
|
|
||||||
is($focus, $top->id, "Top window focused (wrapping to the bottom works)");
|
|
||||||
|
|
||||||
#####################################################################
|
|
||||||
# Restore of focus after moving windows out/into the stack
|
|
||||||
#####################################################################
|
|
||||||
|
|
||||||
$focus = focus_after("ml");
|
|
||||||
is($focus, $top->id, "Top window still focused (focus after moving)");
|
|
||||||
|
|
||||||
$focus = focus_after("h");
|
|
||||||
is($focus, $bottom->id, "Bottom window focused (focus after moving)");
|
|
||||||
|
|
||||||
my $new = i3test::open_standard_window($x);
|
|
||||||
sleep(0.25);
|
|
||||||
|
|
||||||
# By now, we have this layout:
|
|
||||||
# ----------------
|
|
||||||
# | mid |
|
|
||||||
# | bottom | top
|
|
||||||
# | new |
|
|
||||||
# ----------------
|
|
||||||
|
|
||||||
$focus = focus_after("l");
|
|
||||||
is($focus, $top->id, "Got top window");
|
|
||||||
|
|
||||||
$focus = focus_after("mh");
|
|
||||||
is($focus, $top->id, "Moved it into the stack");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $new->id, "Window above is new");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $bottom->id, "Window above is bottom");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $mid->id, "Window above is mid");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $top->id, "At top again");
|
|
||||||
|
|
||||||
$focus = focus_after("ml");
|
|
||||||
is($focus, $top->id, "Still at top, moved out");
|
|
||||||
|
|
||||||
$focus = focus_after("h");
|
|
||||||
is($focus, $mid->id, "At mid again");
|
|
||||||
|
|
||||||
$focus = focus_after("j");
|
|
||||||
is($focus, $bottom->id, "At bottom again");
|
|
||||||
|
|
||||||
$focus = focus_after("l");
|
|
||||||
is($focus, $top->id, "At top again");
|
|
||||||
|
|
||||||
$focus = focus_after("mh");
|
|
||||||
is($focus, $top->id, "Still at top, moved into");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $bottom->id, "Window above is bottom");
|
|
||||||
|
|
||||||
$focus = focus_after("k");
|
|
||||||
is($focus, $mid->id, "Window above is mid");
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue