testcases: let i3test.pm export $x, adapt testcases

diff --git a/testcases/lib/i3test.pm b/testcases/lib/i3test.pm
index ad598b846ccbf87a0ff3eadbd6bfc49d2aa42a6c..f5cb0602cd33e5e45f6a826a289c9efdabdef836 100644 (file)
--- a/testcases/lib/i3test.pm
+++ b/testcases/lib/i3test.pm
@@ -39,6 +39,7 @@ our @EXPORT = qw(
     wait_for_event
     wait_for_map
     wait_for_unmap
+    $x
 );
 
 my $tester = Test::Builder->new();
@@ -46,6 +47,8 @@ my $_cached_socket_path = undef;
 my $_sync_window = undef;
 my $tmp_socket_path = undef;
 
+our $x;
+
 BEGIN {
     my $window_count = 0;
     sub counter_window {
@@ -72,6 +75,7 @@ __
     strict->import;
     warnings->import;
 
+    $x ||= i3test::X11->new;
     @_ = ($class);
     goto \&Exporter::import;
 }
@@ -404,7 +408,6 @@ sub get_socket_path {
         return $_cached_socket_path;
     }
 
-    my $x = X11::XCB::Connection->new;
     my $atom = $x->atom(name => 'I3_SOCKET_PATH');
     my $cookie = $x->get_property(0, $x->get_root_window(), $atom->id, GET_PROPERTY_TYPE_ANY, 0, 256);
     my $reply = $x->get_property_reply($cookie->{sequence});

diff --git a/testcases/t/001-tile.t b/testcases/t/001-tile.t
index 0db3b83b3e824cb4bb241c304b02b6690c37a7ed..066bc64045397870058a5af14e0793eab93fc46d 100644 (file)
--- a/testcases/t/001-tile.t
+++ b/testcases/t/001-tile.t
@@ -2,13 +2,7 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB 'WINDOW_CLASS_INPUT_OUTPUT';
 
 my $original_rect = X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30);
 

diff --git a/testcases/t/002-i3-sync.t b/testcases/t/002-i3-sync.t
index 7518c9493b466daf6109a96413a23885b6dd8d62..75871f9deaa190850c93aab1b09a898c92407311 100644 (file)
--- a/testcases/t/002-i3-sync.t
+++ b/testcases/t/002-i3-sync.t
@@ -3,12 +3,8 @@
 #
 # checks if i3 supports I3_SYNC
 #
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 my $result = sync_with_i3($x);
 ok($result, 'syncing was successful');
 

diff --git a/testcases/t/003-ipc.t b/testcases/t/003-ipc.t
index 982ece7e9a2c7f232dc530d19b4bfce63edeea7a..296375ab9b298f80abc80aafa79d5c33021292dd 100644 (file)
--- a/testcases/t/003-ipc.t
+++ b/testcases/t/003-ipc.t
@@ -3,8 +3,6 @@
 
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/004-unmanaged.t b/testcases/t/004-unmanaged.t
index 1ef934ee5f99f3f6bdddf18e1a66c2d9050187c7..70bdb557fb3deaea1df900a80b1afc2c3e525118 100644 (file)
--- a/testcases/t/004-unmanaged.t
+++ b/testcases/t/004-unmanaged.t
@@ -2,13 +2,7 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB 'WINDOW_CLASS_INPUT_OUTPUT';
 
 my $original_rect = X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30);
 

diff --git a/testcases/t/005-floating.t b/testcases/t/005-floating.t
index d605328d491124ca9c4556da56afcf4f0ce85c0b..7e6b89227ffbb16e0c35de2602b584a17481eb85 100644 (file)
--- a/testcases/t/005-floating.t
+++ b/testcases/t/005-floating.t
@@ -2,13 +2,7 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB 'WINDOW_CLASS_INPUT_OUTPUT';
 
 # Create a floating window which is smaller than the minimum enforced size of i3
 my $window = $x->root->create_child(

diff --git a/testcases/t/100-fullscreen.t b/testcases/t/100-fullscreen.t
index ae8c63f67de6789e0e366878a7dc4702a155f578..e014da485f92bb5793c898f9aab951e0e6bf19ed 100644 (file)
--- a/testcases/t/100-fullscreen.t
+++ b/testcases/t/100-fullscreen.t
@@ -2,7 +2,7 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
+use X11::XCB 'WINDOW_CLASS_INPUT_OUTPUT';
 use List::Util qw(first);
 
 my $i3 = i3(get_socket_path());
@@ -26,12 +26,6 @@ for my $o (@outputs) {
     }
 }
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 ##################################
 # map a window, then fullscreen it
 ##################################

diff --git a/testcases/t/101-focus.t b/testcases/t/101-focus.t
index 51119007f2c3c53d913089cac23aea9ec680006f..070d1385688c87e7b41e5649bdf22ad85556bd05 100644 (file)
--- a/testcases/t/101-focus.t
+++ b/testcases/t/101-focus.t
@@ -3,8 +3,6 @@
 
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/102-dock.t b/testcases/t/102-dock.t
index 092cf3d27ca1ad783cb741deda937f479c3ee5a6..213052f598a70e142cd99f7ecc70fe883dbcb2eb 100644 (file)
--- a/testcases/t/102-dock.t
+++ b/testcases/t/102-dock.t
@@ -2,15 +2,9 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
+use X11::XCB 'PROP_MODE_REPLACE';
 use List::Util qw(first);
 
-BEGIN {
-    use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
-}
-
-my $x = X11::XCB::Connection->new;
-
 #####################################################################
 # verify that there is no dock window yet
 #####################################################################

diff --git a/testcases/t/104-focus-stack.t b/testcases/t/104-focus-stack.t
index b5be284c3b0cbde3eedc9b6387643a490100d06c..8807d01597ce6d9ff35a0cf9b23f08c868878e6f 100644 (file)
--- a/testcases/t/104-focus-stack.t
+++ b/testcases/t/104-focus-stack.t
@@ -5,8 +5,6 @@
 
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 fresh_workspace;
 
 cmd 'split h';

diff --git a/testcases/t/111-goto.t b/testcases/t/111-goto.t
index 76baec0ea34a3e18c95ad35b46673c95189e41d7..0da9e8e0c68b13faaef98ca3ad39400e3d8e5f73 100644 (file)
--- a/testcases/t/111-goto.t
+++ b/testcases/t/111-goto.t
@@ -4,8 +4,6 @@
 use i3test;
 use File::Temp;
 
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 cmd 'split h';

diff --git a/testcases/t/112-floating-resize.t b/testcases/t/112-floating-resize.t
index ac3387a9ef7afcd69120ca25ca316a2b02005e2d..a428df4f8b92a58317b653fc16e013660d85ad9d 100644 (file)
--- a/testcases/t/112-floating-resize.t
+++ b/testcases/t/112-floating-resize.t
@@ -2,13 +2,6 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
-}
-
-my $x = X11::XCB::Connection->new;
 
 fresh_workspace;
 

diff --git a/testcases/t/113-urgent.t b/testcases/t/113-urgent.t
index cb547667f90a9361f52d60518c157ee01c222b57..2b78b882d1adbb0b184324a4b8679f9f791d511a 100644 (file)
--- a/testcases/t/113-urgent.t
+++ b/testcases/t/113-urgent.t
@@ -2,15 +2,8 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
 use List::Util qw(first);
 
-BEGIN {
-    use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/114-client-leader.t b/testcases/t/114-client-leader.t
index 6f7ffce032e3d440e99552c8e5ef5b9aa97037f5..d2fd16a0617f0451476420dc8e4a4b8c62d4378d 100644 (file)
--- a/testcases/t/114-client-leader.t
+++ b/testcases/t/114-client-leader.t
@@ -2,13 +2,6 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
-}
-
-my $x = X11::XCB::Connection->new;
 
 my $tmp = fresh_workspace;
 

diff --git a/testcases/t/119-match.t b/testcases/t/119-match.t
index 8b9d21d3e0da46fbc422bda5041cd9365fcbbb61..80c94ab1f9ab30d1d52f58c311a8245b788f4273 100644 (file)
--- a/testcases/t/119-match.t
+++ b/testcases/t/119-match.t
@@ -4,14 +4,13 @@
 # Tests all kinds of matching methods
 #
 use i3test;
-use X11::XCB qw(:all);
+use X11::XCB qw(PROP_MODE_REPLACE WINDOW_CLASS_INPUT_OUTPUT);
 
 my $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
 # Open a new window
-my $x = X11::XCB::Connection->new;
 my $window = open_window($x);
 my $content = get_ws_content($tmp);
 ok(@{$content} == 1, 'window mapped');

diff --git a/testcases/t/124-move.t b/testcases/t/124-move.t
index a6eb61648384d2108a3a4f1a53f769cc9fe3b091..9d7a235faccdcabfa0c2c4dfbd56cdd5bfb37337 100644 (file)
--- a/testcases/t/124-move.t
+++ b/testcases/t/124-move.t
@@ -8,9 +8,7 @@
 # 4) move a container in a different direction so that we need to go up in tree
 #
 use i3test;
-use X11::XCB::Connection;
 
-my $x = X11::XCB::Connection->new;
 my $i3 = i3(get_socket_path());
 
 my $tmp = fresh_workspace;

diff --git a/testcases/t/129-focus-after-close.t b/testcases/t/129-focus-after-close.t
index 8d22561359234e5643d3815e9fc3081e350c183f..1bb2eedc63bcdeee5c80416a190844c6c6a951dd 100644 (file)
--- a/testcases/t/129-focus-after-close.t
+++ b/testcases/t/129-focus-after-close.t
@@ -4,11 +4,8 @@
 # Check if the focus is correctly restored after closing windows.
 #
 use i3test;
-use X11::XCB qw(:all);
 use List::Util qw(first);
 
-my $x = X11::XCB::Connection->new;
-
 my $i3 = i3(get_socket_path());
 
 my $tmp = fresh_workspace;

diff --git a/testcases/t/132-move-workspace.t b/testcases/t/132-move-workspace.t
index 82e59dd11cea0f1373fe2dacc76187a2f9e0e2fb..1643fc756cece0d274db3a7b721f6729cbb03125 100644 (file)
--- a/testcases/t/132-move-workspace.t
+++ b/testcases/t/132-move-workspace.t
@@ -9,7 +9,6 @@ my $i3 = i3(get_socket_path());
 
 # We move the pointer out of our way to avoid a bug where the focus will
 # be set to the window under the cursor
-my $x = X11::XCB::Connection->new;
 $x->root->warp_pointer(0, 0);
 
 my $tmp = get_unused_workspace();

diff --git a/testcases/t/133-size-hints.t b/testcases/t/133-size-hints.t
index d2d77e8e0f2ae6abb6b14684776dfcf26b96c62b..90ecf62e8623d7a64d3f662a7ca4044f8294dfa8 100644 (file)
--- a/testcases/t/133-size-hints.t
+++ b/testcases/t/133-size-hints.t
@@ -5,8 +5,6 @@
 #
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');

diff --git a/testcases/t/135-floating-focus.t b/testcases/t/135-floating-focus.t
index 5e5a68f23c3389e474eb9b7a7f396d1b41e80e7d..bae983e740416937e3e5cb88d3164758f3b417e8 100644 (file)
--- a/testcases/t/135-floating-focus.t
+++ b/testcases/t/135-floating-focus.t
@@ -2,10 +2,6 @@
 # vim:ts=4:sw=4:expandtab
 
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 my $tmp = fresh_workspace;
 

diff --git a/testcases/t/136-floating-ws-empty.t b/testcases/t/136-floating-ws-empty.t
index a6e0e405e867de092fa8a42035a3dcc45576fb89..1666884e5e1bafb221ce2f4a54eb2fac0a21e9b0 100644 (file)
--- a/testcases/t/136-floating-ws-empty.t
+++ b/testcases/t/136-floating-ws-empty.t
@@ -3,11 +3,6 @@
 # Regression test: when only having a floating window on a workspace, it should not be deleted.
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
 
@@ -19,8 +14,6 @@ my $tmp = fresh_workspace;
 
 ok(workspace_exists($tmp), "workspace $tmp exists");
 
-my $x = X11::XCB::Connection->new;
-
 # Create a floating window which is smaller than the minimum enforced size of i3
 my $window = open_floating_window($x);
 ok($window->mapped, 'Window is mapped');

diff --git a/testcases/t/137-floating-unmap.t b/testcases/t/137-floating-unmap.t
index ab1a33d313e7d9478476e30258a0828baf437278..29762594e51922059fd1cf14fd9cfd28b4f1d4c3 100644 (file)
--- a/testcases/t/137-floating-unmap.t
+++ b/testcases/t/137-floating-unmap.t
@@ -4,11 +4,6 @@
 # to a different workspace.
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
 
@@ -18,8 +13,6 @@ my $tmp = fresh_workspace;
 # 1: open a floating window, get it mapped
 #############################################################################
 
-my $x = X11::XCB::Connection->new;
-
 # Create a floating window which is smaller than the minimum enforced size of i3
 my $window = open_floating_window($x);
 ok($window->mapped, 'Window is mapped');

diff --git a/testcases/t/138-floating-attach.t b/testcases/t/138-floating-attach.t
index ae035f61672c333329da24a52c5b8d1f472f59f9..9a7996b1bead10933d1dc957d8608550854ba5e3 100644 (file)
--- a/testcases/t/138-floating-attach.t
+++ b/testcases/t/138-floating-attach.t
@@ -4,11 +4,6 @@
 # if only a floating window is present on the workspace.
 
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
 
@@ -18,8 +13,6 @@ my $tmp = fresh_workspace;
 # 1: open a floating window, get it mapped
 #############################################################################
 
-my $x = X11::XCB::Connection->new;
-
 # Create a floating window
 my $window = open_floating_window($x);
 ok($window->mapped, 'Window is mapped');

diff --git a/testcases/t/139-ws-numbers.t b/testcases/t/139-ws-numbers.t
index 31f013efd8cb2646d436f3f5d2e1bf9de13b0371..9d73ad1c5721e00cff2358760619e0bde181fa01 100644 (file)
--- a/testcases/t/139-ws-numbers.t
+++ b/testcases/t/139-ws-numbers.t
@@ -3,14 +3,8 @@
 # Check if numbered workspaces and named workspaces are sorted in the right way
 # in get_workspaces IPC output (necessary for i3bar etc.).
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
-my $x = X11::XCB::Connection->new;
 
 sub check_order {
     my ($msg) = @_;

diff --git a/testcases/t/140-focus-lost.t b/testcases/t/140-focus-lost.t
index fb77f01e83b75ebefb943da352e4cfde2af09162..cd6eee389b59a61fdb47b9c7c6b8554f63c1dbfb 100644 (file)
--- a/testcases/t/140-focus-lost.t
+++ b/testcases/t/140-focus-lost.t
@@ -3,14 +3,8 @@
 # Regression: Check if the focus stays the same when switching the layout
 # bug introduced by 77d0d42ed2d7ac8cafe267c92b35a81c1b9491eb
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
-my $x = X11::XCB::Connection->new;
 
 sub check_order {
     my ($msg) = @_;

diff --git a/testcases/t/141-resize.t b/testcases/t/141-resize.t
index 8691a044fda77ffd3501e19a633a302a59cc5551..18e28ccb76dd4bf1bec7cae0fb7049fc67fe250e 100644 (file)
--- a/testcases/t/141-resize.t
+++ b/testcases/t/141-resize.t
@@ -2,13 +2,6 @@
 # vim:ts=4:sw=4:expandtab
 # Tests resizing tiling containers
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
 
 my $tmp = fresh_workspace;
 

diff --git a/testcases/t/144-regress-floating-resize.t b/testcases/t/144-regress-floating-resize.t
index 44a67bc3e4996c22e5660c2e8bec0aa9108a6d72..fa1edda58312c31a27470b9a73a9854b5dd49959 100644 (file)
--- a/testcases/t/144-regress-floating-resize.t
+++ b/testcases/t/144-regress-floating-resize.t
@@ -8,9 +8,6 @@
 #
 use i3test;
 use List::Util qw(sum);
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 my $tmp = fresh_workspace;
 

diff --git a/testcases/t/145-flattening.t b/testcases/t/145-flattening.t
index 6810f479fdef2baf2bf900b18883ffbe1bafebe6..8baf92172edb469c4f3a0917984fd8a4314adb10 100644 (file)
--- a/testcases/t/145-flattening.t
+++ b/testcases/t/145-flattening.t
@@ -10,11 +10,8 @@
 #
 # This testcase checks that the tree is properly flattened after moving.
 #
-use X11::XCB qw(:all);
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 my $left = open_window($x);

diff --git a/testcases/t/146-floating-reinsert.t b/testcases/t/146-floating-reinsert.t
index b63e7ac97886e8e0393849954004343abbec0df1..1015f8f8ea9651fd155e8b93e618881e0311efd9 100644 (file)
--- a/testcases/t/146-floating-reinsert.t
+++ b/testcases/t/146-floating-reinsert.t
@@ -1,15 +1,8 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 my $left = open_window($x);

diff --git a/testcases/t/147-regress-floatingmove.t b/testcases/t/147-regress-floatingmove.t
index 5f14741b732902dcce6b95dbab5832d3ad5ac9b0..74adef69157ba9d6f0d9d324580aa66a31f36ad7 100644 (file)
--- a/testcases/t/147-regress-floatingmove.t
+++ b/testcases/t/147-regress-floatingmove.t
@@ -4,16 +4,8 @@
 # Regression test for moving a con outside of a floating con when there are no
 # tiling cons on a workspace
 #
-use X11::XCB qw(:all);
-use Time::HiRes qw(sleep);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 my $left = open_window($x);

diff --git a/testcases/t/148-regress-floatingmovews.t b/testcases/t/148-regress-floatingmovews.t
index 6f9dfc40d47a36ceb2de6b888ec01a8fd68e8d70..0e6345b28a0139bbde60dd0407e715dcfa9aaf95 100644 (file)
--- a/testcases/t/148-regress-floatingmovews.t
+++ b/testcases/t/148-regress-floatingmovews.t
@@ -4,15 +4,8 @@
 # Regression test for correct focus behaviour when moving a floating con to
 # another workspace.
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 # open a tiling window on the first workspace

diff --git a/testcases/t/150-regress-dock-restart.t b/testcases/t/150-regress-dock-restart.t
index e294e6bd3de9fe70dc312f72bf19011577adfcc4..a28e0730f64c66be713071a988db7ec46fb86711 100644 (file)
--- a/testcases/t/150-regress-dock-restart.t
+++ b/testcases/t/150-regress-dock-restart.t
@@ -3,15 +3,8 @@
 #
 # Regression test for inplace restarting with dock clients
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/153-floating-originalsize.t b/testcases/t/153-floating-originalsize.t
index db0b6e9c63649bab76d70e31bc45b42dee62b9f2..2c798cfaa7d57f7fba1dd23c4f9def4099266419 100644 (file)
--- a/testcases/t/153-floating-originalsize.t
+++ b/testcases/t/153-floating-originalsize.t
@@ -3,13 +3,10 @@
 #
 # Test if the requested width/height is set after making the window floating.
 #
-use X11::XCB qw(:all);
 use i3test;
 
 my $tmp = fresh_workspace;
 
-my $x = X11::XCB::Connection->new;
-
 # Create a floating window which is smaller than the minimum enforced size of i3
 my $window = open_window($x, { rect => [ 0, 0, 400, 150 ] });
 

diff --git a/testcases/t/154-regress-multiple-dock.t b/testcases/t/154-regress-multiple-dock.t
index 8b7f456cd3bd9bc22cd2ff478e08651019e77a8c..52ab4004d24eb197a1baa5215b736a3236f6b80a 100644 (file)
--- a/testcases/t/154-regress-multiple-dock.t
+++ b/testcases/t/154-regress-multiple-dock.t
@@ -3,15 +3,8 @@
 #
 # Regression test for closing one of multiple dock clients
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/155-floating-split-size.t b/testcases/t/155-floating-split-size.t
index 5de05e8b2dceb44fb55f9becef9f9d8ab7df71d0..618266b60cbfa2eda3495491a41f1087e74a8404 100644 (file)
--- a/testcases/t/155-floating-split-size.t
+++ b/testcases/t/155-floating-split-size.t
@@ -4,15 +4,8 @@
 # Test to see if i3 combines the geometry of all children in a split container
 # when setting the split container to floating
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/156-fullscreen-focus.t b/testcases/t/156-fullscreen-focus.t
index a559b5a5134cb81c4238924167d7bc760797b9d3..e188b375e5e0ef594866a0a06462226b034c67c0 100644 (file)
--- a/testcases/t/156-fullscreen-focus.t
+++ b/testcases/t/156-fullscreen-focus.t
@@ -4,14 +4,8 @@
 # Test if new containers get focused when there is a fullscreen container at
 # the time of launching the new one.
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
 my $i3 = i3(get_socket_path());
 
 my $tmp = fresh_workspace;

diff --git a/testcases/t/157-regress-fullscreen-level-up.t b/testcases/t/157-regress-fullscreen-level-up.t
index f067cb934bc4b23d98cdf3249158a0f2526e104a..2c9c4b174407117f7f6b35be4db7ba0947106b36 100644 (file)
--- a/testcases/t/157-regress-fullscreen-level-up.t
+++ b/testcases/t/157-regress-fullscreen-level-up.t
@@ -3,15 +3,8 @@
 #
 # Regression test: level up should be a noop during fullscreen mode
 #
-use X11::XCB qw(:all);
 use i3test;
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
-
 my $tmp = fresh_workspace;
 
 #####################################################################

diff --git a/testcases/t/158-wm_take_focus.t b/testcases/t/158-wm_take_focus.t
index a90ce1c3d04641cb6e18a8167cad7a7b4931f13e..3da8d90788d6226aa1894275ad3576baa7a8eaad 100644 (file)
--- a/testcases/t/158-wm_take_focus.t
+++ b/testcases/t/158-wm_take_focus.t
@@ -3,11 +3,7 @@
 #
 # Tests if the WM_TAKE_FOCUS protocol is correctly handled by i3
 #
-use X11::XCB qw(:all);
 use i3test;
-use v5.10;
-
-my $x = X11::XCB::Connection->new;
 
 subtest 'Window without WM_TAKE_FOCUS', sub {
     fresh_workspace;

diff --git a/testcases/t/161-regress-borders-restart.t b/testcases/t/161-regress-borders-restart.t
index c5e3ef8080c2cd2224cee9815d931f0a98e71dab..ce53b0026ad24a9c24efbbeecfe66921ac111142 100644 (file)
--- a/testcases/t/161-regress-borders-restart.t
+++ b/testcases/t/161-regress-borders-restart.t
@@ -5,11 +5,9 @@
 # restart.
 # found in eb8ad348b28e243cba1972e802ca8ee636472fc9
 #
-use X11::XCB qw(:all);
 use List::Util qw(first);
 use i3test;
 
-my $x = X11::XCB::Connection->new;
 my $i3 = i3(get_socket_path());
 my $tmp = fresh_workspace;
 my $window = open_window($x);

diff --git a/testcases/t/162-regress-dock-urgent.t b/testcases/t/162-regress-dock-urgent.t
index 5fb88129ea3c6e320e1f1916f603809680a9641d..39e4eac4bfb12c042cb76e850effd4065196303c 100644 (file)
--- a/testcases/t/162-regress-dock-urgent.t
+++ b/testcases/t/162-regress-dock-urgent.t
@@ -4,14 +4,9 @@
 # Regression test for setting the urgent hint on dock clients.
 # found in 4be3178d4d360c2996217d811e61161c84d25898
 #
-use X11::XCB qw(:all);
 use i3test;
+use X11::XCB 'WINDOW_CLASS_INPUT_OUTPUT';
 
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $x = X11::XCB::Connection->new;
 my $i3 = i3(get_socket_path());
 
 my $tmp = fresh_workspace;

diff --git a/testcases/t/163-wm-state.t b/testcases/t/163-wm-state.t
index e55d86824de934d97cab3fb0b21f5773618c3e0d..e5b42df4d96471aee81f46796971c7a56a2c9a83 100644 (file)
--- a/testcases/t/163-wm-state.t
+++ b/testcases/t/163-wm-state.t
@@ -4,10 +4,8 @@
 # Tests if WM_STATE is WM_STATE_NORMAL when mapped and WM_STATE_WITHDRAWN when
 # unmapped.
 #
-use X11::XCB qw(:all);
 use i3test;
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB qw(ICCCM_WM_STATE_NORMAL ICCCM_WM_STATE_WITHDRAWN);
 
 my $window = open_window($x);
 

diff --git a/testcases/t/164-kill-win-vs-client.t b/testcases/t/164-kill-win-vs-client.t
index 41ae64329ffa468c8bd42466826af4e1069c2561..df9b7fd868ea134e3c120566015fe8556a7c3e9a 100644 (file)
--- a/testcases/t/164-kill-win-vs-client.t
+++ b/testcases/t/164-kill-win-vs-client.t
@@ -6,8 +6,6 @@
 #
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 sub two_windows {
     my $tmp = fresh_workspace;
 

diff --git a/testcases/t/165-for_window.t b/testcases/t/165-for_window.t
index b3fef117c62f5b302710d61a6cc63d5162cabd51..88c542ebc955a31ba747b023611b28743990c3a0 100644 (file)
--- a/testcases/t/165-for_window.t
+++ b/testcases/t/165-for_window.t
@@ -3,11 +3,8 @@
 # !NO_I3_INSTANCE! will prevent complete-run.pl from starting i3
 #
 #
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
 use i3test;
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB qw(PROP_MODE_REPLACE WINDOW_CLASS_INPUT_OUTPUT);
 
 ##############################################################
 # 1: test the following directive:

diff --git a/testcases/t/166-assign.t b/testcases/t/166-assign.t
index 9492486c8c53852cb830d8af0b8107e6dc81c1f6..d2bb9fa7bec9219768c1f48384f1979a3ed8f18a 100644 (file)
--- a/testcases/t/166-assign.t
+++ b/testcases/t/166-assign.t
@@ -5,11 +5,7 @@
 # Tests if assignments work
 #
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-use v5.10;
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB qw(PROP_MODE_REPLACE WINDOW_CLASS_INPUT_OUTPUT);
 
 # TODO: move to X11::XCB
 sub set_wm_class {

diff --git a/testcases/t/167-workspace_layout.t b/testcases/t/167-workspace_layout.t
index 553717c523ea06881a239b365b47e7855a8bd455..2744c9ba1fb6afd2fe9b4d28157eeb9535643fbb 100644 (file)
--- a/testcases/t/167-workspace_layout.t
+++ b/testcases/t/167-workspace_layout.t
@@ -6,10 +6,6 @@
 #
 
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 #####################################################################
 # 1: check that with an empty config, cons are place next to each

diff --git a/testcases/t/168-regress-fullscreen-restart.t b/testcases/t/168-regress-fullscreen-restart.t
index 1418b402d38bff307f2386b13f34254e643a3b5a..70bddd8ecf0c0c4866a724b6697491192ba74208 100644 (file)
--- a/testcases/t/168-regress-fullscreen-restart.t
+++ b/testcases/t/168-regress-fullscreen-restart.t
@@ -4,10 +4,6 @@
 # Verifies that i3 survives inplace restarts with fullscreen containers
 #
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 fresh_workspace;
 

diff --git a/testcases/t/170-force_focus_wrapping.t b/testcases/t/170-force_focus_wrapping.t
index d2f15a655aa68916e860b5472a1cf23485ee138d..b8920c2d16f1e5cdab979274cf66ab5550bad180 100644 (file)
--- a/testcases/t/170-force_focus_wrapping.t
+++ b/testcases/t/170-force_focus_wrapping.t
@@ -6,8 +6,6 @@
 #
 use i3test;
 
-my $x = i3test::X11->new;
-
 #####################################################################
 # 1: test the wrapping behaviour without force_focus_wrapping
 #####################################################################

diff --git a/testcases/t/172-start-on-named-ws.t b/testcases/t/172-start-on-named-ws.t
index cdd2001d21ed25bd5784459c847773223b944d7f..97ae16e96effab59a28a6b9235a1c32736cf57e8 100644 (file)
--- a/testcases/t/172-start-on-named-ws.t
+++ b/testcases/t/172-start-on-named-ws.t
@@ -4,12 +4,8 @@
 #
 # checks if i3 starts up on workspace '1' or the first configured named workspace
 #
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 ##############################################################
 # 1: i3 should start with workspace '1'
 ##############################################################

diff --git a/testcases/t/173-regress-focus-assign.t b/testcases/t/173-regress-focus-assign.t
index 70414af398264f56752025861277a58bd3497549..bd0ff647fc295cc1a2b9750ed6b7f0332f213bac 100644 (file)
--- a/testcases/t/173-regress-focus-assign.t
+++ b/testcases/t/173-regress-focus-assign.t
@@ -6,11 +6,7 @@
 # assigned to an invisible workspace
 #
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-use v5.10;
-
-my $x = X11::XCB::Connection->new;
+use X11::XCB qw(PROP_MODE_REPLACE WINDOW_CLASS_INPUT_OUTPUT);
 
 # TODO: move to X11::XCB
 sub set_wm_class {

diff --git a/testcases/t/174-border-config.t b/testcases/t/174-border-config.t
index cc1f5c90298137a0d3dc10928f0229c567061d9f..a27126cbad15a30c1c6e387eea5d783e7df9345a 100644 (file)
--- a/testcases/t/174-border-config.t
+++ b/testcases/t/174-border-config.t
@@ -7,8 +7,6 @@
 
 use i3test;
 
-my $x = X11::XCB::Connection->new;
-
 #####################################################################
 # 1: check that new windows start with 'normal' border unless configured
 # otherwise

diff --git a/testcases/t/175-startup-notification.t b/testcases/t/175-startup-notification.t
index 55df41429f75705e7b144be60f2e81ce91a57857..b624508b463d0b5acd40cd086d17f4c404d95c5b 100644 (file)
--- a/testcases/t/175-startup-notification.t
+++ b/testcases/t/175-startup-notification.t
@@ -8,7 +8,6 @@ use i3test;
 use POSIX qw(mkfifo);
 use File::Temp qw(:POSIX);
 
-my $x = X11::XCB::Connection->new;
 use ExtUtils::PkgConfig;
 
 # setup dependency on libstartup-notification using pkg-config

diff --git a/testcases/t/176-workspace-baf.t b/testcases/t/176-workspace-baf.t
index 48ea948ddba518f2276d7866eab5ca85417865f9..31c4f2484f3eb673753785c88a55c560945bb478 100644 (file)
--- a/testcases/t/176-workspace-baf.t
+++ b/testcases/t/176-workspace-baf.t
@@ -7,9 +7,6 @@
 #
 
 use i3test;
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 my $config = <<EOT;
 # i3 config file (v4)