Merge the relationship resolution rework

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

diff --git a/t/cdbi/multi_column_set.t b/t/cdbi/multi_column_set.t
index 4311456..cf0632a 100644 (file)
--- a/t/cdbi/multi_column_set.t
+++ b/t/cdbi/multi_column_set.t
@@ -1,16 +1,16 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'cdbicompat';
+
 use strict;
-use Test::More;
+use warnings;
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  plan $@ ? (skip_all => "Class::Trigger and DBIx::ContextualFetch required: $@")
-          : (tests=> 3);
-}
+use Test::More;
+use lib 't/cdbi/testlib';
 
 {
     package Thing;
 
-    use base 'DBIx::Class::Test::SQLite';
+    use base 'DBIC::Test::SQLite';
 
     Thing->columns(TEMP => qw[foo bar baz]);
     Thing->columns(All  => qw[some real stuff]);
@@ -23,3 +23,5 @@ is $thing->some, "woosh";
 is $thing->baz, 99;
 
 $thing->discard_changes;
+
+done_testing;