X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi%2F03-subclassing.t;h=8a73a0944c57e06814f806adaf181edb7c65cf84;hb=b47fb9c0;hp=1740de380746259cddf25552d75f634253d89b34;hpb=50891152d0b24649bfd67bdba97feec86b11c064;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi/03-subclassing.t b/t/cdbi/03-subclassing.t
index 1740de3..8a73a09 100644
--- a/t/cdbi/03-subclassing.t
+++ b/t/cdbi/03-subclassing.t
@@ -1,20 +1,14 @@
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'cdbicompat';
+
 use strict;
+use warnings;
+
 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;
-  }
-  eval "use DBD::SQLite";
-  plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 6);
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -22,10 +16,12 @@ INIT { @Film::Threat::ISA = qw/Film/; }
 
 ok(Film::Threat->db_Main->ping, 'subclass db_Main()');
 is_deeply [ sort Film::Threat->columns ], [ sort Film->columns ],
-	'has the same columns';
+  'has the same columns';
 
 my $bt = Film->create_test_film;
 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;