Merge branch 'master' into topic/constructor_rewrite

[dbsrgits/DBIx-Class.git] / t / cdbi / 16-reserved.t

diff --git a/t/cdbi/16-reserved.t b/t/cdbi/16-reserved.t
index 67693a0..380c819 100644 (file)
--- a/t/cdbi/16-reserved.t
+++ b/t/cdbi/16-reserved.t
@@ -1,19 +1,9 @@
 use strict;
 use Test::More;
 
-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 => 5);
-}
-
 use lib 't/cdbi/testlib';
-require Film;
-require Order;
+use Film;
+use Order;
 
 Film->has_many(orders => 'Order');
 Order->has_a(film => 'Film');
@@ -34,3 +24,5 @@ my $infilm = $bto->film;
 isa_ok $infilm, "Film";
 
 is $infilm->id, $film->id, "Orders hasa Film";
+
+done_testing;