X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F25backcompat.t;h=57a9c04ebb2a6a3b74923f33fa1ca723dc8abd27;hb=4b5eca90f633645050d77e5d0c98d05a6cc37502;hp=cc4a7551c859e1b5de38b55391f12d6c8bf6e2e8;hpb=a9a6e6bbea8a7bda16b348c24e63d7be3eea24ba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/25backcompat.t b/t/25backcompat.t
index cc4a755..57a9c04 100644
--- a/t/25backcompat.t
+++ b/t/25backcompat.t
@@ -6,13 +6,14 @@ use File::Path qw/rmtree make_path/;
 use Class::Unload;
 use File::Temp qw/tempfile tempdir/;
 use IO::File;
-use File::Slurp 'slurp';
 use DBIx::Class::Schema::Loader ();
+use DBIx::Class::Schema::Loader::Utils 'slurp_file';
 use Lingua::EN::Inflect::Number ();
 use lib qw(t/lib);
 use make_dbictest_db_with_unique;
+use dbixcsl_test_dir qw/$tdir/;
 
-my $DUMP_DIR = './t/_common_dump';
+my $DUMP_DIR = "$tdir/common_dump";
 rmtree $DUMP_DIR;
 my $SCHEMA_CLASS = 'DBIXCSL_Test::Schema';
 
@@ -57,7 +58,7 @@ sub class_content_like;
         Bar   => 'Foos',
     });
 
-    my $res = run_loader(naming => 'current');
+    my $res = run_loader(naming => 'current', use_namespaces => 0);
     my $schema = $res->{schema};
 
     is scalar @{ $res->{warnings} }, 1,
@@ -733,8 +734,8 @@ sub class_content_like;
     my $res = run_loader(static => 1, naming => 'current');
     my $schema = $res->{schema};
 
-    my $file = $schema->_loader->_get_dump_filename($SCHEMA_CLASS);
-    my $code = slurp $file;
+    my $file = $schema->loader->get_dump_filename($SCHEMA_CLASS);
+    my $code = slurp_file $file;
 
     my ($dumped_ver) =
         $code =~ /^# Created by DBIx::Class::Schema::Loader v(\S+)/m;
@@ -891,7 +892,7 @@ sub run_loader {
 
     my @connect_info = $make_dbictest_db_with_unique::dsn;
     my @loader_warnings;
-    local $SIG{__WARN__} = sub { push(@loader_warnings, $_[0]); };
+    local $SIG{__WARN__} = sub { push(@loader_warnings, @_); };
     eval qq{
         package $SCHEMA_CLASS;
         use base qw/DBIx::Class::Schema::Loader/;
@@ -1300,8 +1301,8 @@ sub _rel_condition {
 sub class_content_like {
     my ($schema, $class, $re, $test_name) = @_;
 
-    my $file = $schema->_loader->_get_dump_filename($class);
-    my $code = slurp $file;
+    my $file = $schema->loader->get_dump_filename($class);
+    my $code = slurp_file $file;
 
     like $code, $re, $test_name;
 }
@@ -1332,7 +1333,7 @@ EOF
 sub _write_custom_content {
     my ($schema, $class, $content) = @_;
 
-    my $pm = $schema->_loader->_get_dump_filename($class);
+    my $pm = $schema->loader->get_dump_filename($class);
     {
         local ($^I, @ARGV) = ('.bak', $pm);
         while (<>) {