less boilerplate by using Test::Kit and -It/lib in Makefile

diff --git a/testcases/Makefile b/testcases/Makefile
index 1e7a91913032f7505a63b107fff473023918a13b..0e78f6b2c131b3f11eda3664d47d72fec28b657f 100644 (file)
--- a/testcases/Makefile
+++ b/testcases/Makefile
@@ -1,4 +1,7 @@
 test:
-       PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" t/16*.t
+       PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/03* t/05*
 
 all: test
+
+testfull:
+       PERL_DL_NONLAZY=1 /usr/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(1)" -It/lib t/01* t/02* t/03* t/05* t/17* t/18* t/19* t/20*

diff --git a/testcases/t/01-tile.t b/testcases/t/01-tile.t
index a5aa143d0175f50989cca60a3252296896879a2b..b40eae2484a21f427051bd04338134502698a4c4 100644 (file)
--- a/testcases/t/01-tile.t
+++ b/testcases/t/01-tile.t
@@ -1,9 +1,7 @@
 #!perl
 
-use Test::More tests => 4;
-use Test::Deep;
+use i3test tests => 4;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
 
 BEGIN {

diff --git a/testcases/t/02-fullscreen.t b/testcases/t/02-fullscreen.t
index cf542ee7926ab1f91b9e515fdbaa7ca8a564309f..98194ba21c23ba61ca24ea0c7e11059b4684efdb 100644 (file)
--- a/testcases/t/02-fullscreen.t
+++ b/testcases/t/02-fullscreen.t
@@ -1,20 +1,11 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 24;
-use Test::Deep;
+use i3test tests => 24;
 use X11::XCB qw(:all);
-use Data::Dumper;
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 use List::Util qw(first);
-use v5.10;
-
-# We use relatively long sleeps (1/4 second) to make sure the window manager
-# reacted.
 use Time::HiRes qw(sleep);
+use v5.10;
 
 my $i3 = i3("/tmp/nestedcons");
 

diff --git a/testcases/t/03-unmanaged.t b/testcases/t/03-unmanaged.t
index 3cd9833a4fa1afdd359468b51683f6005a5ef4a7..3e8cdfc1f49be1bbb427fa3437a2d052d60e72d7 100644 (file)
--- a/testcases/t/03-unmanaged.t
+++ b/testcases/t/03-unmanaged.t
@@ -1,10 +1,8 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 5;
-use Test::Deep;
+use i3test tests => 5;
 use X11::XCB qw(:all);
-use Data::Dumper;
 
 BEGIN {
     use_ok('X11::XCB::Window');

diff --git a/testcases/t/04-floating.t b/testcases/t/04-floating.t
index 9049b9dc82699fcea7f6273e14cc9f36914e7b72..4463bcbeab352c46eb3ba7af1189bd654b934383 100644 (file)
--- a/testcases/t/04-floating.t
+++ b/testcases/t/04-floating.t
@@ -1,14 +1,9 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 10;
-use Test::Deep;
+use i3test tests => 10;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
 
 BEGIN {
     use_ok('X11::XCB::Window');

diff --git a/testcases/t/05-ipc.t b/testcases/t/05-ipc.t
index 8f4279389be7c4e90663fa6b0b909b372795d0ba..13ebc4b2dfdfdff750726576e9648767ccb5f75c 100644 (file)
--- a/testcases/t/05-ipc.t
+++ b/testcases/t/05-ipc.t
@@ -1,18 +1,11 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 3;
-use Test::Deep;
+use i3test tests => 3;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
-    use_ok('IO::Socket::UNIX') or BAIL_OUT('Cannot load IO::Socket::UNIX');
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');
 }
 

diff --git a/testcases/t/06-focus.t b/testcases/t/06-focus.t
index a95e0e40b959c2f47b31f94f4a7b4455c4137fd7..b91f8cc5501440d53eb4401b7cb4944ad5047ba2 100644 (file)
--- a/testcases/t/06-focus.t
+++ b/testcases/t/06-focus.t
@@ -4,15 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 13;
-use Test::Deep;
+use i3test tests => 13;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/07-move.t b/testcases/t/07-move.t
index efd3df15da29ab703908563362142e4218368048..c852d0014987e54d4ede1c00976bddea9e9bb014 100644 (file)
--- a/testcases/t/07-move.t
+++ b/testcases/t/07-move.t
@@ -4,15 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 8;
-use Test::Deep;
+use i3test tests => 8;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/08-focus-stack.t b/testcases/t/08-focus-stack.t
index 4ae924070e4c7dca84c33e1297a21dac8ee6141d..9dd7726f40fe2337e2f84ed70474f55d575ce468 100644 (file)
--- a/testcases/t/08-focus-stack.t
+++ b/testcases/t/08-focus-stack.t
@@ -3,15 +3,9 @@
 # Checks if the focus is correctly restored, when creating a floating client
 # over an unfocused tiling client and destroying the floating one again.
 
-use Test::More tests => 4;
-use Test::Deep;
+use i3test tests => 4;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Window') or BAIL_OUT('Could not load X11::XCB::Window');

diff --git a/testcases/t/09-stacking.t b/testcases/t/09-stacking.t
index 59d2e6f467119308f61875c21bae592b734e044a..c809be9ef637a5d763033260e2018138a29188a4 100644 (file)
--- a/testcases/t/09-stacking.t
+++ b/testcases/t/09-stacking.t
@@ -4,15 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 22;
-use Test::Deep;
+use i3test tests => 22;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/10-dock.t b/testcases/t/10-dock.t
index 5206313133a4ee0453f1ea6b87567e216891771b..83816296412d77a98717284376fac708767b489d 100644 (file)
--- a/testcases/t/10-dock.t
+++ b/testcases/t/10-dock.t
@@ -1,14 +1,9 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 2;
-use Test::Deep;
+use i3test tests => 2;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
 use List::Util qw(first);
 
 BEGIN {

diff --git a/testcases/t/11-goto.t b/testcases/t/11-goto.t
index 9b06112b172832af6e18bad9f214f6c9a959d04e..ea17b4065981ea631e43948dd51dd8fed2d30902 100644 (file)
--- a/testcases/t/11-goto.t
+++ b/testcases/t/11-goto.t
@@ -4,16 +4,10 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 7;
-use Test::Deep;
+use i3test tests => 7;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
 use Digest::SHA1 qw(sha1_base64);
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/12-floating-resize.t b/testcases/t/12-floating-resize.t
index 74f66535013c12e11a5ac5f816467dd0bf080dbb..0d309c680a7ece34f00790b04af0ec29d78838ee 100644 (file)
--- a/testcases/t/12-floating-resize.t
+++ b/testcases/t/12-floating-resize.t
@@ -4,16 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 15;
-use Test::Deep;
+use i3test tests => 15;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use Digest::SHA1 qw(sha1_base64);
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/13-urgent.t b/testcases/t/13-urgent.t
index 5fce6aeeccc08a4690d9b89007eb6e519e3c96b3..cf847456f82a36582ce98856d622720a012a0a26 100644 (file)
--- a/testcases/t/13-urgent.t
+++ b/testcases/t/13-urgent.t
@@ -4,16 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 7;
-use Test::Deep;
+use i3test tests => 7;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use Digest::SHA1 qw(sha1_base64);
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/14-client-leader.t b/testcases/t/14-client-leader.t
index b9160131e76afb88e7eba48020ee97dc7ab41241..bf07b9273c66f3482ecb290b52ab117644e2be74 100644 (file)
--- a/testcases/t/14-client-leader.t
+++ b/testcases/t/14-client-leader.t
@@ -4,16 +4,9 @@
 # the workspace to be empty).
 # TODO: skip it by default?
 
-use Test::More tests => 3;
-use Test::Deep;
+use i3test tests => 3;
 use X11::XCB qw(:all);
-use Data::Dumper;
 use Time::HiRes qw(sleep);
-use FindBin;
-use Digest::SHA1 qw(sha1_base64);
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 BEGIN {
     use_ok('X11::XCB::Connection') or BAIL_OUT('Cannot load X11::XCB::Connection');

diff --git a/testcases/t/15-ipc-workspaces.t b/testcases/t/15-ipc-workspaces.t
index 4e2c0e8daf5e5b2b96f50bf9b8f4cfc02350004e..3cf3e5626fe5df6b669c7a4ac1c78d789a5a1133 100644 (file)
--- a/testcases/t/15-ipc-workspaces.t
+++ b/testcases/t/15-ipc-workspaces.t
@@ -1,13 +1,8 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 3;
-use Test::Exception;
+use i3test tests => 2;
 use List::MoreUtils qw(all);
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
 
 my $i3 = i3;
 

diff --git a/testcases/t/16-nestedcons.t b/testcases/t/16-nestedcons.t
index 39087e856aaf45210009d8c7f625021b24843a2a..3159929bd778c6db585b0bc1b129ee55541e31a6 100644 (file)
--- a/testcases/t/16-nestedcons.t
+++ b/testcases/t/16-nestedcons.t
@@ -1,11 +1,8 @@
 #!perl
 # vim:ts=4:sw=4:expandtab
 
-use Test::More tests => 8;
-use Test::Deep;
+use i3test tests => 8;
 use List::MoreUtils qw(all none);
-use Data::Dumper;
-use AnyEvent::I3;
 
 my $i3 = i3("/tmp/nestedcons");
 

diff --git a/testcases/t/17-workspace.t b/testcases/t/17-workspace.t
index 227b754d5d29255ac75e863962d95a9513961863..c350d9d9e45600de8391dcc6ff64998ac773f2b6 100644 (file)
--- a/testcases/t/17-workspace.t
+++ b/testcases/t/17-workspace.t
@@ -4,11 +4,7 @@
 # Tests whether we can switch to a non-existant workspace
 # (necessary for further tests)
 #
-use Test::More tests => 2;
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
+use i3test tests => 2;
 use v5.10;
 
 my $i3 = i3("/tmp/nestedcons");

diff --git a/testcases/t/18-openkill.t b/testcases/t/18-openkill.t
index 935523d485685956806ba5dd304d3e29e8b7d1f0..1d9d705dd3aebf9e4345a1ba1ee9f943cd93bbba 100644 (file)
--- a/testcases/t/18-openkill.t
+++ b/testcases/t/18-openkill.t
@@ -3,12 +3,7 @@
 #
 # Tests whether opening an empty container and killing it again works
 #
-use Test::More tests => 6;
-use Data::Dumper;
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
+use i3test tests => 6;
 use v5.10;
 
 my $i3 = i3("/tmp/nestedcons");

diff --git a/testcases/t/19-match.t b/testcases/t/19-match.t
index 9babb0740bd88fee2932d8c1919659ca25a16069..b5c01977bfc994250fa66d2169763cd93720cb3b 100644 (file)
--- a/testcases/t/19-match.t
+++ b/testcases/t/19-match.t
@@ -3,12 +3,7 @@
 #
 # Tests all kinds of matching methods
 #
-use Test::More tests => 4;
-use Data::Dumper;
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
+use i3test tests => 4;
 use X11::XCB qw(:all);
 use v5.10;
 

diff --git a/testcases/t/20-multiple-cmds.t b/testcases/t/20-multiple-cmds.t
index 361bb06ba1f5c05b9af427972b3a75c8b14d8f6d..9ee5b41c180fc57ef011afee0e6fb4c3603f621a 100644 (file)
--- a/testcases/t/20-multiple-cmds.t
+++ b/testcases/t/20-multiple-cmds.t
@@ -3,12 +3,7 @@
 #
 # Tests multiple commands (using ';') and multiple operations (using ',')
 #
-use Test::More tests => 24;
-use Data::Dumper;
-use FindBin;
-use lib "$FindBin::Bin/lib";
-use i3test;
-use AnyEvent::I3;
+use i3test tests => 24;
 use X11::XCB qw(:all);
 use v5.10;
 

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index 684e8118977464fdb4ea77aa1c13995a42afaa00..68455bd2171a235987e2c70333d09ea03835a4d6 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -1,12 +1,22 @@
 package i3test;
 # vim:ts=4:sw=4:expandtab
 
+use Test::Kit qw(
+    Test::Exception
+    Data::Dumper
+    AnyEvent::I3
+),
+    'Test::Deep' => {
+        exclude => [ qw(all) ],
+    };
+
 use File::Temp qw(tmpnam);
 use X11::XCB::Rect;
 use X11::XCB::Window;
 use X11::XCB qw(:all);
 use AnyEvent::I3;
-use Exporter qw(import);
+# Test::Kit already uses Exporter
+#use Exporter qw(import);
 use base 'Exporter';
 
 our @EXPORT = qw(get_workspace_names get_unused_workspace get_ws_content);