move roles to the end of the generated class so that "requires" works with columns...

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 25backcompat.t

diff --git a/t/25backcompat.t b/t/25backcompat.t
index 7a92fbe..57540f8 100644 (file)
--- a/t/25backcompat.t
+++ b/t/25backcompat.t
@@ -58,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,
@@ -734,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) =
@@ -892,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/;
@@ -1301,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;
@@ -1333,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 (<>) {