Merge the relationship resolution rework

[dbsrgits/DBIx-Class.git] / t / cdbi / construct.t

diff --git a/t/cdbi/construct.t b/t/cdbi/construct.t
index 1ee7f14..5040b06 100644 (file)
--- a/t/cdbi/construct.t
+++ b/t/cdbi/construct.t
@@ -1,16 +1,13 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'cdbicompat';
+
 use strict;
+use warnings;
+
 use Test::More;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@")
-          : (tests=> 5);
-}
-
-INIT {
-    use lib 't/cdbi/testlib';
-    use Film;
-}
+use lib 't/cdbi/testlib';
+use Film;
 
 {
     Film->insert({
@@ -38,6 +35,8 @@ INIT {
     my $film = Foo->construct({
         temp_thing  => 23
     });
-    
+
     ::is $film->temp_thing, 23, "construct sets temp columns";
 }
+
+done_testing;