Reorganize CDBICompat tests - centralize prereq checks in one place

lib/DBIx/Class/Optional/Dependencies.pm

@@ -231,11 +231,10 @@ my $reqs = {
 
   test_cdbicompat => {
     req => {
-      'DBIx::ContextualFetch'     => '0',
+      'Class::DBI' => 0,
       'Class::DBI::Plugin::DeepAbstractSearch' => '0',
-      'Class::Trigger'            => '0',
+      %$datetime_basic,
       'Time::Piece::MySQL'        => '0',
-      'Clone'                     => '0',
       'Date::Simple'              => '3.03',
     },
   },

t/cdbi/01-columns.t

@@ -3,11 +3,6 @@ use strict;
 use Test::More;
 use lib 't/cdbi/testlib';
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@") : (tests=> 24);
-}
-
 
 #-----------------------------------------------------------------------
 # Make sure that we can set up columns properly
@@ -152,3 +147,4 @@ is join (' ', sort A->columns),    'id',          "A columns";
 is join (' ', sort A::B->columns), 'b1 id',       "A::B columns";
 is join (' ', sort A::C->columns), 'c1 c2 c3 id', "A::C columns";
 
+done_testing;

t/cdbi/02-Film.t

@@ -4,14 +4,6 @@ use Scalar::Util 'refaddr';
 use namespace::clean;
 $| = 1;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 98;
-}
-
 INIT {
   use lib 't/cdbi/testlib';
   use Film;
@@ -412,3 +404,5 @@ SKIP: {
     "Creating and retrieving gives ref to same object";
 
 }
+
+done_testing;

t/cdbi/03-subclassing.t

@@ -5,15 +5,6 @@ use Test::More;
 # Make sure subclasses can be themselves subclassed
 #----------------------------------------------------------------------
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-    next;
-  }
-  plan tests => 6;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -28,3 +19,5 @@ ok my $btaste = Film::Threat->retrieve('Bad Taste'), "subclass retrieve";
 isa_ok $btaste => "Film::Threat";
 isa_ok $btaste => "Film";
 is $btaste->Title, 'Bad Taste', 'subclass get()';
+
+done_testing;

t/cdbi/04-lazy.t

@@ -7,14 +7,6 @@ use Test::Warn;
 # Test lazy loading
 #----------------------------------------------------------------------
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@
-    ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required')
-    : (tests => 36)
-  ;
-}
-
 INIT {
   use lib 't/cdbi/testlib';
   use Lazy;
@@ -179,3 +171,5 @@ SKIP: {
     # I'm too lazy to set up the proper inflation test.
     ok !exists $l->{_column_data}{orp};
 }
+
+done_testing;

t/cdbi/06-hasa.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@");
-  }
-  plan tests => 24;
-}
-
 @YA::Film::ISA = 'Film';
 
 #local $SIG{__WARN__} = sub { };
@@ -166,3 +158,4 @@ isa_ok($foo->fav, "Film");
   isa_ok $foo, "Film", "Object in after_create trigger";
 }
 
+done_testing;

t/cdbi/08-inheritcols.t

@@ -1,11 +1,8 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required')
-          : (tests=> 3);
-}
+use lib 't/cdbi/testlib';
+use DBIC::Test::SQLite;
 
 package A;
 @A::ISA = qw(DBIx::Class::CDBICompat);
@@ -23,3 +20,5 @@ package main;
 is join (' ', sort A->columns),    'id',          "A columns";
 is join (' ', sort A::B->columns), 'b1 id',       "A::B columns";
 is join (' ', sort A::C->columns), 'c1 c2 c3 id', "A::C columns";
+
+done_testing;

t/cdbi/09-has_many.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan skip_all => 'Class::Trigger and DBIx::ContextualFetch required' if $@;
-  plan tests => 31;
-}
-
-
 use lib 't/cdbi/testlib';
 use Film;
 use Actor;
@@ -124,3 +116,5 @@ is($as->Name, 'Arnold Schwarzenegger', "Arnie's still Arnie");
 
     is_deeply [sort map { $_->id } $other_thing->things], [1,2];
 }
+
+done_testing;

t/cdbi/11-triggers.t

@@ -1,15 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-    next;
-  }
-  plan tests => 13;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -63,3 +54,5 @@ ok $ver->delete, "Delete";
   });
   Film->create({director => "Me"});
 }
+
+done_testing;

t/cdbi/12-filter.t

@@ -1,15 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-    next;
-  }
-  plan tests => 50;
-}
-
 use lib 't/cdbi/testlib';
 use Actor;
 use Film;
@@ -172,3 +163,5 @@ delete $film->{related_resultsets};
   eval { $film->actors->delete_all };
   is $@, '', "Deleting again does no harm";
 }
+
+done_testing;

t/cdbi/13-constraint.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 23;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -100,6 +92,8 @@ ok $fred, "Got fred";
     is $freeaa && $freeaa->codirector, '2001-03-03', "Set the codirector";
 }
 
+done_testing;
+
 __DATA__
 
 use CGI::Untaint;
@@ -114,4 +108,3 @@ sub _constrain_by_untaint {
         return 1;
     });
 }
-

t/cdbi/14-might_have.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 22;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 use Blurb;
@@ -78,4 +70,6 @@ Film->create_test_film;
     ok $host->info->delete;
     $host->discard_changes;
     ok !$host->info, 'relationships rechecked after discard_changes';
-}
+}
+
+done_testing;

t/cdbi/15-accessor.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-    eval "use DBIx::Class::CDBICompat;";
-    if ($@) {
-        plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-    }
-    plan tests => 75;
-}
-
 INIT {
     #local $SIG{__WARN__} =
         #sub { like $_[0], qr/clashes with built-in method/, $_[0] };
@@ -266,3 +258,5 @@ is $@, '', "No errors";
 
     $_->discard_changes for ($naked, $sandl);
 }
+
+done_testing;

t/cdbi/16-reserved.t

@@ -1,17 +1,9 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 5;
-}
-
 use lib 't/cdbi/testlib';
-require Film;
-require Order;
+use Film;
+use Order;
 
 Film->has_many(orders => 'Order');
 Order->has_a(film => 'Film');
@@ -32,3 +24,5 @@ my $infilm = $bto->film;
 isa_ok $infilm, "Film";
 
 is $infilm->id, $film->id, "Orders hasa Film";
+
+done_testing;

t/cdbi/18-has_a.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 41;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 use Director;
@@ -236,3 +228,5 @@ SKIP: {
   eval { Film->has_a(driector => "Director") };
   like $@, qr/driector/, "Sensible error from has_a with incorrect column: $@";
 }
+
+done_testing;

t/cdbi/19-set_sql.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 20;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 use Actor;
@@ -128,3 +120,4 @@ Film->set_sql(
   is $apg[1]->title, "B", "and B";
 }
 
+done_testing;

t/cdbi/21-iterator.t

@@ -1,14 +1,6 @@
 use strict;
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@");
-  }
-  plan tests => 37;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -92,3 +84,5 @@ my @film  = (
   is $it, 0;
   ok !$it, "iterator returns false when no results";
 }
+
+done_testing;

t/cdbi/22-deflate_order.t

@@ -3,12 +3,12 @@ use strict;
 
 use Test::More;
 
-eval "use DBIx::Class::CDBICompat; use Time::Piece::MySQL;";
-if ($@) {
-    plan (skip_all => "Time::Piece::MySQL, Class::Trigger and DBIx::ContextualFetch required: $@");
-}
-
 use lib 't/cdbi/testlib';
+use DBIC::Test::SQLite (); # this will issue the necessary SKIPs on missing reqs
+
+eval { require Time::Piece::MySQL }
+  or plan skip_all => 'Time::Piece::MySQL required for this test';
+
 use_ok ('Log');
 
 package main;

t/cdbi/22-self_referential.t

@@ -1,10 +1,5 @@
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => 'Class::Trigger and DBIx::ContextualFetch required') : (tests=> 2);
-}
-
 use strict;
 
 use lib 't/cdbi/testlib';
@@ -22,4 +17,4 @@ my @aliases = $first->aliases;
 is( scalar @aliases, 1, 'proper number of aliases' );
 is( $aliases[ 0 ]->name, 'Second', 'proper alias' );
 
-
+done_testing;