Merge the relationship resolution rework

[dbsrgits/DBIx-Class.git] / t / cdbi / 03-subclassing.t

diff --git a/t/cdbi/03-subclassing.t b/t/cdbi/03-subclassing.t
index 433999d..b5ac32f 100644 (file)
--- a/t/cdbi/03-subclassing.t
+++ b/t/cdbi/03-subclassing.t
@@ -1,19 +1,15 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+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;
-  }
-  plan tests => 6;
-}
-
 use lib 't/cdbi/testlib';
 use Film;
 
@@ -28,3 +24,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;