Merge the relationship resolution rework

[dbsrgits/DBIx-Class.git] / t / cdbi / 23-cascade.t

diff --git a/t/cdbi/23-cascade.t b/t/cdbi/23-cascade.t
index dbd55c6..cedf91a 100644 (file)
--- a/t/cdbi/23-cascade.t
+++ b/t/cdbi/23-cascade.t
@@ -1,20 +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;
-use Data::Dumper;
+use DBIx::Class::_Util 'dump_value';
 
-BEGIN {
-  eval "use DBIx::Class::CDBICompat;";
-  if ($@) {
-    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
-  }
-  plan tests => 12;
-}
-
-INIT {
-    use lib 't/cdbi/testlib';
-    use Film;
-    use Director;
-}
+use lib 't/cdbi/testlib';
+use Film;
+use Director;
 
 { # Cascade on delete
     Director->has_many(nasties => 'Film');
@@ -47,15 +42,14 @@ for my $args ({ no_cascade_delete => 1 }, { cascade => "None" }) {
     is $dir->nasties, 1, "We have one nasty";
 
     ok $dir->delete;
-    local $Data::Dumper::Terse = 1;
-    ok +Film->retrieve("Alligator"), 'has_many with ' . Dumper ($args);;
+    ok +Film->retrieve("Alligator"), 'has_many with ' . dump_value $args;
     $kk->delete;
 }
 
 
 #{ # Fail on cascade
 #    local $TODO = 'cascade => "Fail" unimplemented';
-#    
+#
 #    Director->has_many(nasties => Film => { cascade => 'Fail' });
 #
 #    my $dir = Director->insert({ name => "Nasty Noddy" });
@@ -74,3 +68,5 @@ for my $args ({ no_cascade_delete => 1 }, { cascade => "None" }) {
 #    ok eval { $dir->delete };
 #    is $@, '', "Can delete once films are gone";
 #}
+
+done_testing;