use_namespaces is now default, still needs the upgrade code

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 23dumpmore.t

diff --git a/t/23dumpmore.t b/t/23dumpmore.t
index 3c9cf12..c27973e 100644 (file)
--- a/t/23dumpmore.t
+++ b/t/23dumpmore.t
@@ -6,9 +6,9 @@ use IPC::Open3;
 use make_dbictest_db;
 require DBIx::Class::Schema::Loader;
 
-$^O eq 'MSWin32'
-    ? plan(skip_all => "ActiveState perl produces additional warnings, and this test uses unix paths")
-    : plan(tests => 145);
+$^O eq 'MSWin32' && plan(skip_all =>
+"ActiveState perl produces additional warnings, and this test uses unix paths"
+);
 
 my $DUMP_PATH = './t/_dump';
 
@@ -63,6 +63,7 @@ sub do_dump_test {
     my %tdata = @_;
     
     $tdata{options}{dump_directory} = $DUMP_PATH;
+    $tdata{options}{use_namespaces} ||= 0;
 
     for my $dumper (\&dump_directly, \&dump_dbicdump) {
         test_dumps(\%tdata, $dumper->(%tdata));
@@ -142,11 +143,15 @@ do_dump_test(
         ],
         Foo => [
             qr/package DBICTest::DumpMore::1::Foo;/,
+            qr/=head1 NAME/,
+            qr/=head1 ACCESSORS/,
             qr/->set_primary_key/,
             qr/1;\n$/,
         ],
         Bar => [
             qr/package DBICTest::DumpMore::1::Bar;/,
+            qr/=head1 NAME/,
+            qr/=head1 ACCESSORS/,
             qr/->set_primary_key/,
             qr/1;\n$/,
         ],
@@ -312,4 +317,6 @@ do_dump_test(
     },
 );
 
+done_testing;
+
 END { rmtree($DUMP_PATH, 1, 1); }