Update how author tests load their dependencies

diff --git a/MANIFEST b/MANIFEST
index 37f1a31259caa730ed77256f91c3c1295b47915a..f43eb784f99010861c16459103a1d0c726da162d 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -12,3 +12,4 @@ t/91-pod.t
 t/92-pod-coverage.t
 t/95-portability-files.t
 t/99-kwalitee.t
 t/92-pod-coverage.t
 t/95-portability-files.t
 t/99-kwalitee.t

+t/lib/VPIT/TestHelpers.pm

diff --git a/t/91-pod.t b/t/91-pod.t
index f1e1d3e375d2b802ad35abd32ba55f7f5eddacae..3b6c320f4344b67bfba37c6b35aa35d0894492e8 100644 (file)
--- a/t/91-pod.t
+++ b/t/91-pod.t
@@ -5,6 +5,12 @@ use warnings;
 
 use Test::More;
 
 
 use Test::More;
 

-eval "use Test::Pod 1.14";
-plan skip_all => "Test::Pod 1.14 required for testing POD" if $@;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+load_or_skip('Test::Pod', '1.14', [ ],
+             'required for testing POD syntax');
+
+eval 'use Test::Pod'; # Make Kwalitee test happy
+

 all_pod_files_ok();
 all_pod_files_ok();

diff --git a/t/92-pod-coverage.t b/t/92-pod-coverage.t
index c84e3806be4101f8b85b9befbd9d636bb84ba00f..34a36e87e551265f2c75417cd789ba395bb1f17b 100644 (file)
--- a/t/92-pod-coverage.t
+++ b/t/92-pod-coverage.t
@@ -5,6 +5,12 @@ use warnings;
 
 use Test::More;
 
 
 use Test::More;
 

-eval "use Test::Pod::Coverage 1.04";
-plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@;
-all_pod_coverage_ok( );
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+load_or_skip('Test::Pod::Coverage', '1.04', [ ],
+             'required for testing POD coverage');
+
+eval 'use Test::Pod::Coverage'; # Make Kwalitee test happy
+
+all_pod_coverage_ok();

diff --git a/t/95-portability-files.t b/t/95-portability-files.t
index ab541f3035c5a7691de45403760618ab068e83a5..55a900519fec914952ad4fbb9a6ed6fee0944f68 100644 (file)
--- a/t/95-portability-files.t
+++ b/t/95-portability-files.t
@@ -5,6 +5,10 @@ use warnings;
 
 use Test::More;
 
 
 use Test::More;
 

-eval "use Test::Portability::Files";
-plan skip_all => "Test::Portability::Files required for testing filenames portability" if $@;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+load_or_skip('Test::Portability::Files', undef, [ ],
+             'required for testing filenames portability');
+

 run_tests();
 run_tests();

diff --git a/t/99-kwalitee.t b/t/99-kwalitee.t
index ea20ee1951fc67bdebb61f336affd240c60d4183..a448a64368e35ff541ac57eb463e0ab06989b674 100644 (file)
--- a/t/99-kwalitee.t
+++ b/t/99-kwalitee.t
@@ -5,18 +5,18 @@ use warnings;
 
 use Test::More;
 
 
 use Test::More;
 

-sub VPIT::Guard::DESTROY { unlink for glob 'Debian_CPANTS.txt*' }
+use lib 't/lib';
+use VPIT::TestHelpers;

 
 

-my $guard = bless { }, 'VPIT::Guard';
+my $guard = VPIT::TestHelpers::Guard->new(
+ sub { unlink for glob 'Debian_CPANTS.txt*' }
+);

 
 

-eval { require Parse::RecDescent; 'Parse::RecDescent'->VERSION('1.967006') }
-  or plan skip_all => 'Parse::RecDescent version 1.967006 or greater required';
+my $desc = 'required to test kwalitee';

 
 

-eval { require Module::ExtractUse; 'Module::ExtractUse'->VERSION('0.24') }
-  or plan skip_all => 'Module::ExtractUse version 0.24 or greater required';
-
-eval { require Test::Kwalitee; 1 }
-  or plan skip_all => 'Test::Kwalitee required';
+load_or_skip('Parse::RecDescent',  '1.967006', undef, $desc);
+load_or_skip('Module::ExtractUse', '0.24',     undef, $desc);
+load_or_skip('Test::Kwalitee',     undef,      undef, $desc);

 
 SKIP: {
  eval { Test::Kwalitee->import(); };
 
 SKIP: {
  eval { Test::Kwalitee->import(); };

diff --git a/t/lib/VPIT/TestHelpers.pm b/t/lib/VPIT/TestHelpers.pm
new file mode 100644 (file)
index 0000000..0ac9200
--- /dev/null
+++ b/t/lib/VPIT/TestHelpers.pm
@@ -0,0 +1,65 @@
+package VPIT::TestHelpers;
+
+use strict;
+use warnings;
+
+my %exports = (
+ load_or_skip => \&load_or_skip,
+ skip_all     => \&skip_all,
+);
+
+sub import {
+ my $pkg = caller;
+ while (my ($name, $code) = each %exports) {
+  no strict 'refs';
+  *{$pkg.'::'.$name} = $code;
+ }
+}
+
+sub skip_all {
+ my ($msg) = @_;
+ require Test::More;
+ Test::More::plan(skip_all => $msg);
+}
+
+sub diag {
+ require Test::More;
+ Test::More::diag($_) for @_;
+}
+
+sub load_or_skip {
+ my ($pkg, $ver, $imports, $desc) = @_;
+ my $spec = $ver && $ver !~ /^[0._]*$/ ? "$pkg $ver" : $pkg;
+ local $@;
+ if (eval "use $spec (); 1") {
+  $ver = do { no strict 'refs'; ${"${pkg}::VERSION"} };
+  $ver = 'undef' unless defined $ver;
+  if ($imports) {
+   my @imports = @$imports;
+   my $caller  = (caller 0)[0];
+   local $@;
+   my $res = eval <<"IMPORTER";
+package
+        $caller;
+BEGIN { \$pkg->import(\@imports) }
+1;
+IMPORTER
+   skip_all "Could not import '@imports' from $pkg $ver: $@" unless $res;
+  }
+  diag "Using $pkg $ver";
+ } else {
+  skip_all "$spec $desc";
+ }
+}
+
+package VPIT::TestHelpers::Guard;
+
+sub new {
+ my ($class, $code) = @_;
+
+ bless { code => $code }, $class;
+}
+
+sub DESTROY { $_[0]->{code}->() }
+
+1;