X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F25backcompat.t;h=3aec02f2d8d37f3545e696c05e08bf7dabdaaa45;hb=3bdcf490c99abda52aea5346fddb6f9f6c43bb2c;hp=cc4a7551c859e1b5de38b55391f12d6c8bf6e2e8;hpb=a9a6e6bbea8a7bda16b348c24e63d7be3eea24ba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/t/25backcompat.t b/t/25backcompat.t index cc4a755..3aec02f 100644 --- a/t/25backcompat.t +++ b/t/25backcompat.t @@ -11,8 +11,9 @@ use DBIx::Class::Schema::Loader (); 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'; @@ -733,7 +734,7 @@ 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 $file = $schema->_loader->get_dump_filename($SCHEMA_CLASS); my $code = slurp $file; my ($dumped_ver) = @@ -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,7 +1301,7 @@ sub _rel_condition { sub class_content_like { my ($schema, $class, $re, $test_name) = @_; - my $file = $schema->_loader->_get_dump_filename($class); + my $file = $schema->_loader->get_dump_filename($class); my $code = slurp $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 (<>) {