X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F22dump.t;h=cc92d9d9168f47796635b714cfee697a473a204c;hb=7fea04bcf2e22a78e465b4c8c37cf4136a1dd80d;hp=b01ce1ce88b4b5729f4072d09ec8ce2d265bcb98;hpb=02356864b0d0bcdf0716a4adfd0a69c8360fe00d;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/22dump.t b/t/22dump.t
index b01ce1c..cc92d9d 100644
--- a/t/22dump.t
+++ b/t/22dump.t
@@ -1,17 +1,19 @@
 use strict;
 use Test::More;
+use Test::Exception;
 use Test::Warn;
 use lib qw(t/lib);
 use File::Path;
 use make_dbictest_db;
+use dbixcsl_test_dir qw/$tdir/;
+
+my $dump_path = "$tdir/dump";
 
-my $dump_path = './t/_dump';
 
 {
     package DBICTest::Schema::1;
     use base qw/ DBIx::Class::Schema::Loader /;
     __PACKAGE__->loader_options(
-        relationships => 1,
         dump_directory => $dump_path,
     );
 }
@@ -20,37 +22,48 @@ 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 => 7;
+
+rmtree($dump_path, 1, 1);
+
+lives_ok {
+  warnings_exist { DBICTest::Schema::1->connect($make_dbictest_db::dsn) }
+    [ qr|^Dumping manual schema|, qr|^Schema dump completed| ];
+} 'no death with dump_directory set' or diag "Dump failed: $@";
 
-rmtree($dump_path, 1, 0711);
+DBICTest::Schema::1->_loader_invoked(undef);
 
-eval { DBICTest::Schema::1->connect($make_dbictest_db::dsn) };
-ok(!$@, 'no death with dump_directory set') or diag "Dump failed: $@";
+SKIP: {
+  skip "ActiveState perl produces additional warnings", 1
+    if ($^O eq 'MSWin32');
 
-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';
+  warnings_exist { DBICTest::Schema::1->connect($make_dbictest_db::dsn) }
+    [ qr|^Dumping manual schema|, qr|^Schema dump completed| ];
+
+  rmtree($dump_path, 1, 1);
+}
 
-rmtree($dump_path, 1, 0711);
+lives_ok {
+  warnings_exist { DBICTest::Schema::2->connect($make_dbictest_db::dsn) }
+    [ qr|^Dumping manual schema|, qr|^Schema dump completed| ];
+} 'no death with dump_directory set (overwrite1)' or diag "Dump failed: $@";
 
-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_invoked(undef);
 
-DBICTest::Schema::2->loader(undef);
-eval { DBICTest::Schema::2->connect($make_dbictest_db::dsn) };
-ok(!$@, 'no death with dump_directory set (overwrite2)')
-    or diag "Dump failed: $@";
+lives_ok {
+  warnings_exist { DBICTest::Schema::2->connect($make_dbictest_db::dsn) }
+  [
+    qr/^Dumping manual schema/,
+    qr|^Deleting .+Schema/2.+ due to 'really_erase_my_files'|,
+    qr|^Deleting .+Schema/2/Result/Foo.+ due to 'really_erase_my_files'|,
+    qr|^Deleting .+Schema/2/Result/Bar.+ due to 'really_erase_my_files'|,
+    qr/^Schema dump completed/
+  ];
+} 'no death with dump_directory set (overwrite2)' or diag "Dump failed: $@";
 
 END { rmtree($dump_path, 1, 1); }