Restructure handling of the test scratch-dir, move all activity

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 22dump.t

diff --git a/t/22dump.t b/t/22dump.t
index b01ce1c..0b3a2f8 100644 (file)
--- a/t/22dump.t
+++ b/t/22dump.t
@@ -1,17 +1,21 @@
 use strict;
 use Test::More;
-use Test::Warn;
 use lib qw(t/lib);
 use File::Path;
 use make_dbictest_db;
+use dbixcsl_test_dir qw/$tdir/;
 
-my $dump_path = './t/_dump';
+my $dump_path = "$tdir/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,
     );
 }
@@ -20,35 +24,45 @@ 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 => 4;
+plan tests => 5;
 
-rmtree($dump_path, 1, 0711);
+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);
-warnings_like { DBICTest::Schema::1->connect($make_dbictest_db::dsn) }
-    [
-        qr|Dumping manual schema|,
-        (qr|DBICTest/Schema/1.*?.pm exists, will not overwrite|) x 3,
-        qr|Schema dump completed|
-    ],
-    'warn and skip when attempting to overwrite without option';
+DBICTest::Schema::1->_loader_invoked(undef);
+
+SKIP: {
+  my @warnings_regexes = (
+      qr|Dumping manual schema|,
+      qr|Schema dump completed|,
+  );
+
+  skip "ActiveState perl produces additional warnings", scalar @warnings_regexes
+    if ($^O eq 'MSWin32');
 
-rmtree($dump_path, 1, 0711);
+  my @warn_output;
+  {
+      local $SIG{__WARN__} = sub { push(@warn_output, @_) };
+      DBICTest::Schema::1->connect($make_dbictest_db::dsn);
+  }
+
+  like(shift @warn_output, $_) foreach (@warnings_regexes);
+
+  rmtree($dump_path, 1, 1);
+}
 
 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: $@";