X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F23dumpmore.t;h=a6f5445c4464ef20209b037cd0b2cbe3c423a1af;hb=61c8fd6d54d46095150040bd468e596572fcc378;hp=c0da74235c1ea02b13446249b2cf49d4fb9f163c;hpb=c634fde989b2694edb650f37a3aed6747e94c02d;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/23dumpmore.t b/t/23dumpmore.t
index c0da742..a6f5445 100644
--- a/t/23dumpmore.t
+++ b/t/23dumpmore.t
@@ -1,390 +1,445 @@
+use warnings;
 use strict;
-use Test::More;
-use lib qw(t/lib);
-use File::Path;
-use IPC::Open3;
-use make_dbictest_db;
-require DBIx::Class::Schema::Loader;
-
-my $DUMP_PATH = './t/_dump';
-
-sub dump_directly {
-    my %tdata = @_;
-
-    my $schema_class = $tdata{classname};
-
-    no strict 'refs';
-    @{$schema_class . '::ISA'} = ('DBIx::Class::Schema::Loader');
-    $schema_class->loader_options(%{$tdata{options}});
-
-    my @warns;
-    eval {
-        local $SIG{__WARN__} = sub { push(@warns, @_) };
-        $schema_class->connect($make_dbictest_db::dsn);
-    };
-    my $err = $@;
-    $schema_class->storage->disconnect if !$err && $schema_class->storage;
-    undef *{$schema_class};
-
-    is($err, $tdata{error});
-
-    return @warns;
-}
-
-sub dump_dbicdump {
-    my %tdata = @_;
-
-    # use $^X so we execute ./script/dbicdump with the same perl binary that the tests were executed with
-    my @cmd = ($^X, qw(./script/dbicdump));
-
-    while (my ($opt, $val) = each(%{ $tdata{options} })) {
-        push @cmd, '-o', "$opt=$val";
-    }
-
-    push @cmd, $tdata{classname}, $make_dbictest_db::dsn;
-
-    # make sure our current @INC gets used by dbicdump
-    use Config;
-    local $ENV{PERL5LIB} = join $Config{path_sep}, @INC, $ENV{PERL5LIB};
-
-    my ($in, $out, $err);
-    my $pid = open3($in, $out, $err, @cmd);
 
-    my @warns = <$out>;
-    waitpid($pid, 0);
-
-    return @warns;
-}
+use File::Temp ();
+use Test::More;
 
-sub do_dump_test {
-    my %tdata = @_;
-    
-    $tdata{options}{dump_directory} = $DUMP_PATH;
-    $tdata{options}{use_namespaces} ||= 0;
+use lib qw(t/lib);
+use dbixcsl_dumper_tests;
+my $t = 'dbixcsl_dumper_tests';
 
-    for my $dumper (\&dump_directly, \&dump_dbicdump) {
-        test_dumps(\%tdata, $dumper->(%tdata));
-    }
-}
+$t->cleanup;
 
-sub test_dumps {
-    my ($tdata, @warns) = @_;
-
-    my %tdata = %{$tdata};
-
-    my $schema_class = $tdata{classname};
-    my $check_warns = $tdata{warnings};
-    is(@warns, @$check_warns, "$schema_class warning count");
-    for(my $i = 0; $i <= $#$check_warns; $i++) {
-        like($warns[$i], $check_warns->[$i], "$schema_class warning $i");
-    }
-
-    my $file_regexes = $tdata{regexes};
-    my $file_neg_regexes = $tdata{neg_regexes} || {};
-    my $schema_regexes = delete $file_regexes->{schema};
-    
-    my $schema_path = $DUMP_PATH . '/' . $schema_class;
-    $schema_path =~ s{::}{/}g;
-    dump_file_like($schema_path . '.pm', @$schema_regexes);
-    foreach my $src (keys %$file_regexes) {
-        my $src_file = $schema_path . '/' . $src . '.pm';
-        dump_file_like($src_file, @{$file_regexes->{$src}});
-    }
-    foreach my $src (keys %$file_neg_regexes) {
-        my $src_file = $schema_path . '/' . $src . '.pm';
-        dump_file_not_like($src_file, @{$file_neg_regexes->{$src}});
-    }
-}
+# test loading external content
+$t->dump_test(
+  classname => 'DBICTest::Schema::_no_skip_load_external',
+  warnings => [
+    qr/Dumping manual schema for DBICTest::Schema::_no_skip_load_external to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    Foo => [
+      qr/package DBICTest::Schema::_no_skip_load_external::Foo;\nour \$skip_me = "bad mojo";\n1;/
+    ],
+  },
+);
 
-sub dump_file_like {
-    my $path = shift;
-    open(my $dumpfh, '<', $path) or die "Failed to open '$path': $!";
-    my $contents = do { local $/; <$dumpfh>; };
-    close($dumpfh);
-    my $num = 1;
-    like($contents, $_, "like $path " . $num++) for @_;
-}
+# test skipping external content
+$t->dump_test(
+  classname => 'DBICTest::Schema::_skip_load_external',
+  options => {
+    skip_load_external => 1
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::Schema::_skip_load_external to directory /,
+    qr/Schema dump completed/,
+  ],
+  neg_regexes => {
+    Foo => [
+      qr/package DBICTest::Schema::_skip_load_external::Foo;\nour \$skip_me = "bad mojo";\n1;/
+    ],
+  },
+);
 
-sub dump_file_not_like {
-    my $path = shift;
-    open(my $dumpfh, '<', $path) or die "Failed to open '$path': $!";
-    my $contents = do { local $/; <$dumpfh>; };
-    close($dumpfh);
-    my $num = 1;
-    unlike($contents, $_, "unlike $path ". $num++) for @_;
-}
+$t->cleanup;
+# test config_file
+{
+  my $config_file = File::Temp->new (UNLINK => 1);
 
-sub append_to_class {
-    my ($class, $string) = @_;
-    $class =~ s{::}{/}g;
-    $class = $DUMP_PATH . '/' . $class . '.pm';
-    open(my $appendfh, '>>', $class) or die "Failed to open '$class' for append: $!";
-    print $appendfh $string;
-    close($appendfh);
-}
+  print $config_file "{ skip_relationships => 1 }\n";
+  close $config_file;
 
-rmtree($DUMP_PATH, 1, 1);
-
-# test loading external content
-do_dump_test(
-    classname => 'DBICTest::Schema::13',
-    options => { },
-    error => '',
+  $t->dump_test(
+    classname => 'DBICTest::Schema::_config_file',
+    options => { config_file => "$config_file" },
     warnings => [
-        qr/Dumping manual schema for DBICTest::Schema::13 to directory /,
-        qr/Schema dump completed/,
+      qr/Dumping manual schema for DBICTest::Schema::_config_file to directory /,
+      qr/Schema dump completed/,
     ],
-    regexes => {
-        Foo => [
-qr/package DBICTest::Schema::13::Foo;\nour \$skip_me = "bad mojo";\n1;/
-        ],
+    neg_regexes => {
+      Foo => [
+        qr/has_many/,
+      ],
     },
+  );
+}
+
+# proper exception
+$t->dump_test(
+  classname => 'DBICTest::Schema::_clashing_monikers',
+  test_db_class => 'make_dbictest_db_clashing_monikers',
+  error => qr/tables 'bar', 'bars' reduced to the same source moniker 'Bar'/,
 );
 
-# test skipping external content
-do_dump_test(
-    classname => 'DBICTest::Schema::14',
-    options => { skip_load_external => 1 },
-    error => '',
+
+$t->cleanup;
+
+# test naming => { column_accessors => 'preserve' }
+$t->dump_test(
+    classname => 'DBICTest::Schema::_preserve_column_accessors',
+    test_db_class => 'make_dbictest_db_with_unique',
+    options => { naming => { column_accessors => 'preserve' } },
     warnings => [
-        qr/Dumping manual schema for DBICTest::Schema::14 to directory /,
+        qr/Dumping manual schema for DBICTest::Schema::_preserve_column_accessors to directory /,
         qr/Schema dump completed/,
     ],
     neg_regexes => {
-        Foo => [
-qr/package DBICTest::Schema::14::Foo;\nour \$skip_me = "bad mojo";\n1;/
+        RouteChange => [
+            qr/\baccessor\b/,
         ],
     },
 );
 
-rmtree($DUMP_PATH, 1, 1);
-
-# test out the POD
+$t->cleanup;
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { },
-    error => '',
+# test naming => { monikers => 'plural' }
+$t->dump_test(
+    classname => 'DBICTest::Schema::_plural_monikers',
+    options => { naming => { monikers => 'plural' } },
     warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+        qr/Dumping manual schema for DBICTest::Schema::_plural_monikers to directory /,
         qr/Schema dump completed/,
     ],
     regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_classes/,
+        Foos => [
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_plural_monikers::Foos\n\n=cut\n\n/,
         ],
-        Foo => [
-qr/package DBICTest::DumpMore::1::Foo;/,
-qr/=head1 NAME\n\nDBICTest::DumpMore::1::Foo\n\n=cut\n\n/,
-qr/=head1 ACCESSORS\n\n/,
-qr/=head2 fooid\n\n  data_type: INTEGER\n  default_value: undef\n  is_nullable: 1\n  size: undef\n\n/,
-qr/=head2 footext\n\n  data_type: TEXT\n  default_value: undef\n  is_nullable: 1\n  size: undef\n\n/,
-qr/->set_primary_key/,
-qr/=head1 RELATIONS\n\n/,
-qr/=head2 bars\n\nType: has_many\n\nRelated object: L<DBICTest::DumpMore::1::Bar>\n\n=cut\n\n/,
-qr/1;\n$/,
-        ],
-        Bar => [
-qr/package DBICTest::DumpMore::1::Bar;/,
-qr/=head1 NAME\n\nDBICTest::DumpMore::1::Bar\n\n=cut\n\n/,
-qr/=head1 ACCESSORS\n\n/,
-qr/=head2 barid\n\n  data_type: INTEGER\n  default_value: undef\n  is_nullable: 1\n  size: undef\n\n/,
-qr/=head2 fooref\n\n  data_type: INTEGER\n  default_value: undef\n  is_foreign_key: 1\n  is_nullable: 1\n  size: undef\n\n/,
-qr/->set_primary_key/,
-qr/=head1 RELATIONS\n\n/,
-qr/=head2 fooref\n\nType: belongs_to\n\nRelated object: L<DBICTest::DumpMore::1::Foo>\n\n=cut\n\n/,
-qr/1;\n$/,
+        Bars => [
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_plural_monikers::Bars\n\n=cut\n\n/,
         ],
     },
 );
 
-append_to_class('DBICTest::DumpMore::1::Foo',q{# XXX This is my custom content XXX});
+$t->cleanup;
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { },
-    error => '',
+# test naming => { monikers => 'singular' }
+$t->dump_test(
+    classname => 'DBICTest::Schema::_singular_monikers',
+    test_db_class => 'make_dbictest_db_plural_tables',
+    options => { naming => { monikers => 'singular' } },
     warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+        qr/Dumping manual schema for DBICTest::Schema::_singular_monikers to directory /,
         qr/Schema dump completed/,
     ],
     regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_classes/,
-        ],
         Foo => [
-            qr/package DBICTest::DumpMore::1::Foo;/,
-            qr/->set_primary_key/,
-            qr/1;\n# XXX This is my custom content XXX/,
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_singular_monikers::Foo\n\n=cut\n\n/,
         ],
         Bar => [
-            qr/package DBICTest::DumpMore::1::Bar;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_singular_monikers::Bar\n\n=cut\n\n/,
         ],
     },
 );
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { really_erase_my_files => 1 },
-    error => '',
+$t->cleanup;
+
+# test naming => { monikers => 'preserve' }
+$t->dump_test(
+    classname => 'DBICTest::Schema::_preserve_monikers',
+    test_db_class => 'make_dbictest_db_plural_tables',
+    options => { naming => { monikers => 'preserve' } },
     warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-        qr/Deleting existing file /,
-        qr/Deleting existing file /,
-        qr/Deleting existing file /,
+        qr/Dumping manual schema for DBICTest::Schema::_preserve_monikers to directory /,
         qr/Schema dump completed/,
     ],
     regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_classes/,
-        ],
-        Foo => [
-            qr/package DBICTest::DumpMore::1::Foo;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
+        Foos => [
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_preserve_monikers::Foos\n\n=cut\n\n/,
         ],
-        Bar => [
-            qr/package DBICTest::DumpMore::1::Bar;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
+        Bars => [
+            qr/\n=head1 NAME\n\nDBICTest::Schema::_preserve_monikers::Bars\n\n=cut\n\n/,
         ],
     },
-    neg_regexes => {
-        Foo => [
-            qr/# XXX This is my custom content XXX/,
-        ],
+);
+
+$t->cleanup;
+
+# test out the POD
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    custom_column_info => sub {
+      my ($table, $col, $info) = @_;
+      return +{ extra => { is_footext => 1 } } if $col eq 'footext';
     },
+    result_base_class => 'My::ResultBaseClass',
+    additional_classes => 'TestAdditional',
+    additional_base_classes => 'TestAdditionalBase',
+    left_base_classes => 'TestLeftBase',
+    components => [ 'TestComponent', '+TestComponentFQN' ],
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_classes/,
+    ],
+    Foo => [
+      qr/package DBICTest::DumpMore::1::Foo;/,
+      qr/\n=head1 NAME\n\nDBICTest::DumpMore::1::Foo\n\n=cut\n\nuse strict;\nuse warnings;\n\n/,
+      qr/\n=head1 BASE CLASS: L<My::ResultBaseClass>\n\n=cut\n\nuse base 'My::ResultBaseClass';\n\n/,
+      qr/\n=head1 ADDITIONAL CLASSES USED\n\n=over 4\n\n=item \* L<TestAdditional>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 ADDITIONAL BASE CLASSES\n\n=over 4\n\n=item \* L<TestAdditionalBase>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 LEFT BASE CLASSES\n\n=over 4\n\n=item \* L<TestLeftBase>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 COMPONENTS LOADED\n\n=over 4\n\n=item \* L<DBIx::Class::TestComponent>\n\n=item \* L<TestComponentFQN>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 ACCESSORS\n\n/,
+      qr/\n=head2 fooid\n\n  data_type: 'integer'\n  is_auto_increment: 1\n  is_nullable: 0\n\n/,
+      qr/\n=head2 footext\n\n  data_type: 'text'\n  default_value: 'footext'\n  extra: {is_footext => 1}\n  is_nullable: 1\n\n/,
+      qr/->set_primary_key/,
+      qr/\n=head1 RELATIONS\n\n/,
+      qr/\n=head2 bars\n\nType: has_many\n\nRelated object: L<DBICTest::DumpMore::1::Bar>\n\n=cut\n\n/,
+      qr/1;\n$/,
+    ],
+    Bar => [
+      qr/package DBICTest::DumpMore::1::Bar;/,
+      qr/\n=head1 NAME\n\nDBICTest::DumpMore::1::Bar\n\n=cut\n\nuse strict;\nuse warnings;\n\n/,
+      qr/\n=head1 BASE CLASS: L<My::ResultBaseClass>\n\n=cut\n\nuse base 'My::ResultBaseClass';\n\n/,
+      qr/\n=head1 ADDITIONAL CLASSES USED\n\n=over 4\n\n=item \* L<TestAdditional>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 ADDITIONAL BASE CLASSES\n\n=over 4\n\n=item \* L<TestAdditionalBase>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 LEFT BASE CLASSES\n\n=over 4\n\n=item \* L<TestLeftBase>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 COMPONENTS LOADED\n\n=over 4\n\n=item \* L<DBIx::Class::TestComponent>\n\n=item \* L<TestComponentFQN>\n\n=back\n\n=cut\n\n/,
+      qr/\n=head1 ACCESSORS\n\n/,
+      qr/\n=head2 barid\n\n  data_type: 'integer'\n  is_auto_increment: 1\n  is_nullable: 0\n\n/,
+      qr/\n=head2 fooref\n\n  data_type: 'integer'\n  is_foreign_key: 1\n  is_nullable: 1\n\n/,
+      qr/->set_primary_key/,
+      qr/\n=head1 RELATIONS\n\n/,
+      qr/\n=head2 fooref\n\nType: belongs_to\n\nRelated object: L<DBICTest::DumpMore::1::Foo>\n\n=cut\n\n/,
+      qr/\n1;\n$/,
+    ],
+  },
 );
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { use_namespaces => 1, generate_pod => 0 },
-    error => '',
-    warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-        qr/Schema dump completed/,
+$t->append_to_class('DBICTest::DumpMore::1::Foo',q{# XXX This is my custom content XXX});
+
+
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_classes/,
     ],
-    neg_regexes => {
-        'Result/Foo' => [
-            qr/^=/m,
-        ],
-    },
+    Foo => [
+      qr/package DBICTest::DumpMore::1::Foo;/,
+      qr/->set_primary_key/,
+      qr/1;\n# XXX This is my custom content XXX/,
+    ],
+    Bar => [
+      qr/package DBICTest::DumpMore::1::Bar;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+  },
 );
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { use_namespaces => 1 },
-    error => '',
-    warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-        qr/Schema dump completed/,
+
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    really_erase_my_files => 1 
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Deleting existing file /,
+    qr/Deleting existing file /,
+    qr/Deleting existing file /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_classes/,
     ],
-    regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_namespaces/,
-        ],
-        'Result/Foo' => [
-            qr/package DBICTest::DumpMore::1::Result::Foo;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-        'Result/Bar' => [
-            qr/package DBICTest::DumpMore::1::Result::Bar;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-    },
+    Foo => [
+      qr/package DBICTest::DumpMore::1::Foo;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+    Bar => [
+      qr/package DBICTest::DumpMore::1::Bar;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+  },
+  neg_regexes => {
+    Foo => [
+      qr/# XXX This is my custom content XXX/,
+    ],
+  },
 );
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { use_namespaces => 1,
-                 result_namespace => 'Res',
-                 resultset_namespace => 'RSet',
-                 default_resultset_class => 'RSetBase',
-             },
-    error => '',
-    warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-        qr/Schema dump completed/,
+
+$t->cleanup;
+
+# test namespaces
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    use_namespaces => 1,
+    generate_pod => 0
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  neg_regexes => {
+    'Result/Foo' => [
+      qr/^=/m,
     ],
-    regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_namespaces/,
-            qr/result_namespace => 'Res'/,
-            qr/resultset_namespace => 'RSet'/,
-            qr/default_resultset_class => 'RSetBase'/,
-        ],
-        'Res/Foo' => [
-            qr/package DBICTest::DumpMore::1::Res::Foo;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-        'Res/Bar' => [
-            qr/package DBICTest::DumpMore::1::Res::Bar;/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-    },
+  },
 );
 
-do_dump_test(
-    classname => 'DBICTest::DumpMore::1',
-    options => { use_namespaces => 1,
-                 result_namespace => '+DBICTest::DumpMore::1::Res',
-                 resultset_namespace => 'RSet',
-                 default_resultset_class => 'RSetBase',
-                 result_base_class => 'My::ResultBaseClass',
-                 schema_base_class => 'My::SchemaBaseClass',
-             },
-    error => '',
-    warnings => [
-        qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
-        qr/Schema dump completed/,
+
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    db_schema => 'foo_schema',
+    qualify_objects => 1,
+    use_namespaces => 1
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    'Result/Foo' => [
+      qr/^\Q__PACKAGE__->table("foo_schema.foo");\E/m,
+      # the has_many relname should not have the schema in it!
+      qr/^__PACKAGE__->has_many\(\n  "bars"/m,
     ],
-    regexes => {
-        schema => [
-            qr/package DBICTest::DumpMore::1;/,
-            qr/->load_namespaces/,
-            qr/result_namespace => '\+DBICTest::DumpMore::1::Res'/,
-            qr/resultset_namespace => 'RSet'/,
-            qr/default_resultset_class => 'RSetBase'/,
-            qr/use base 'My::SchemaBaseClass'/,
-        ],
-        'Res/Foo' => [
-            qr/package DBICTest::DumpMore::1::Res::Foo;/,
-            qr/use base 'My::ResultBaseClass'/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-        'Res/Bar' => [
-            qr/package DBICTest::DumpMore::1::Res::Bar;/,
-            qr/use base 'My::ResultBaseClass'/,
-            qr/->set_primary_key/,
-            qr/1;\n$/,
-        ],
-    },
+  },
 );
-eval {
-	do_dump_test(
-		classname => 'DBICTest::DumpMore::1',
-		options   => {
-			use_namespaces    => 1,
-			result_base_class => 'My::MissingResultBaseClass',
-		},
-	);
-};
-ok($@, "exception thrown on bad result_base_class");
-like($@, qr/My::MissingResultBaseClass.*is not installed/, "user-friend error message on missing result_base_class" );
 
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    use_namespaces => 1
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_namespaces/,
+    ],
+    'Result/Foo' => [
+      qr/package DBICTest::DumpMore::1::Result::Foo;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+    'Result/Bar' => [
+      qr/package DBICTest::DumpMore::1::Result::Bar;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+  },
+);
+
+
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    use_namespaces => 1,
+    result_namespace => 'Res',
+    resultset_namespace => 'RSet',
+    default_resultset_class => 'RSetBase',
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_namespaces/,
+      qr/result_namespace => 'Res'/,
+      qr/resultset_namespace => 'RSet'/,
+      qr/default_resultset_class => 'RSetBase'/,
+    ],
+    'Res/Foo' => [
+      qr/package DBICTest::DumpMore::1::Res::Foo;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+    'Res/Bar' => [
+      qr/package DBICTest::DumpMore::1::Res::Bar;/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+  },
+);
 
-done_testing;
 
-END { rmtree($DUMP_PATH, 1, 1) unless $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP} }
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    use_namespaces => 1,
+    result_namespace => '+DBICTest::DumpMore::1::Res',
+    resultset_namespace => 'RSet',
+    default_resultset_class => 'RSetBase',
+    result_base_class => 'My::ResultBaseClass',
+    schema_base_class => 'My::SchemaBaseClass',
+  },
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+  regexes => {
+    schema => [
+      qr/package DBICTest::DumpMore::1;/,
+      qr/->load_namespaces/,
+      qr/result_namespace => '\+DBICTest::DumpMore::1::Res'/,
+      qr/resultset_namespace => 'RSet'/,
+      qr/default_resultset_class => 'RSetBase'/,
+      qr/use base 'My::SchemaBaseClass'/,
+    ],
+    'Res/Foo' => [
+      qr/package DBICTest::DumpMore::1::Res::Foo;/,
+      qr/use base 'My::ResultBaseClass'/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+    'Res/Bar' => [
+      qr/package DBICTest::DumpMore::1::Res::Bar;/,
+      qr/use base 'My::ResultBaseClass'/,
+      qr/->set_primary_key/,
+      qr/1;\n$/,
+    ],
+  },
+);
+
+
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  options => {
+    use_namespaces    => 1,
+    result_base_class => 'My::MissingResultBaseClass',
+  },
+  error => qr/My::MissingResultBaseClass.*is not installed/,
+);
+
+# test quote_char in connect_info for dbicdump
+$t->dump_test(
+  classname => 'DBICTest::DumpMore::1',
+  extra_connect_info => [
+    '',
+    '',
+    { quote_char => '"' },
+  ],
+  warnings => [
+    qr/Dumping manual schema for DBICTest::DumpMore::1 to directory /,
+    qr/Schema dump completed/,
+  ],
+);
+
+done_testing;
+# vim:et sts=4 sw=4 tw=0: