X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F22dump.t;h=671021e9b8440d87d65a41fcdd4378756d3204bc;hb=80a212f5f65cdd0098744b3ff5498250dab205d2;hp=47106a9a6d9691f4de461b42fd9d766395e41639;hpb=e682950b7639702c19753fd0d9a80778083c6bd7;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/22dump.t b/t/22dump.t
index 47106a9..671021e 100644
--- a/t/22dump.t
+++ b/t/22dump.t
@@ -6,11 +6,15 @@ use make_dbictest_db;
 
 my $dump_path = './t/_dump';
 
+local $SIG{__WARN__} = sub {
+    warn $_[0] unless $_[0] =~
+        /really_erase_my_files|Dumping manual schema|Schema dump completed/;
+};
+
 {
     package DBICTest::Schema::1;
     use base qw/ DBIx::Class::Schema::Loader /;
     __PACKAGE__->loader_options(
-        relationships => 1,
         dump_directory => $dump_path,
     );
 }
@@ -19,23 +23,27 @@ my $dump_path = './t/_dump';
     package DBICTest::Schema::2;
     use base qw/ DBIx::Class::Schema::Loader /;
     __PACKAGE__->loader_options(
-        relationships => 1,
         dump_directory => $dump_path,
-        dump_overwrite => 1,
+        really_erase_my_files => 1,
     );
 }
 
-plan tests => 8;
+plan tests => 5;
 
 rmtree($dump_path, 1, 1);
 
 eval { DBICTest::Schema::1->connect($make_dbictest_db::dsn) };
 ok(!$@, 'no death with dump_directory set') or diag "Dump failed: $@";
 
-DBICTest::Schema::1->loader(undef);
+DBICTest::Schema::1->_loader_invoked(undef);
 
 SKIP: {
-  skip "ActiveState perl produces additional warnings", 5
+  my @warnings_regexes = (
+      qr|Dumping manual schema|,
+      qr|Schema dump completed|,
+  );
+
+  skip "ActiveState perl produces additional warnings", scalar @warnings_regexes
     if ($^O eq 'MSWin32');
 
   my @warn_output;
@@ -43,11 +51,6 @@ SKIP: {
       local $SIG{__WARN__} = sub { push(@warn_output, @_) };
       DBICTest::Schema::1->connect($make_dbictest_db::dsn);
   }
-  my @warnings_regexes = (
-      qr|Dumping manual schema|,
-      (qr|DBICTest/Schema/1.*?.pm exists, will not overwrite|) x 3,
-      qr|Schema dump completed|,
-  );
 
   like(shift @warn_output, $_) foreach (@warnings_regexes);
 
@@ -58,7 +61,7 @@ eval { DBICTest::Schema::2->connect($make_dbictest_db::dsn) };
 ok(!$@, 'no death with dump_directory set (overwrite1)')
     or diag "Dump failed: $@";
 
-DBICTest::Schema::2->loader(undef);
+DBICTest::Schema::2->_loader_invoked(undef);
 eval { DBICTest::Schema::2->connect($make_dbictest_db::dsn) };
 ok(!$@, 'no death with dump_directory set (overwrite2)')
     or diag "Dump failed: $@";