X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F25backcompat.t;h=477f65461b592c6670ddf8728dab2f31736484c0;hb=46e71a1b3527936e885facc87a97c586d25ecc67;hp=2e1213de2baeaa090f8a1507e608753076088399;hpb=f3a657ef586cfc7a47a4b72080acd18d9f9c305b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/25backcompat.t b/t/25backcompat.t
index 2e1213d..477f654 100644
--- a/t/25backcompat.t
+++ b/t/25backcompat.t
@@ -6,32 +6,34 @@ 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';
 
 my $RESULT_COUNT = 7;
 
-sub class_content_like;
+sub class_content_contains;
+sub contains;
 
 # test dynamic schema in 0.04006 mode
 {
     my $res = run_loader();
     my $warning = $res->{warnings}[0];
 
-    like $warning, qr/dynamic schema/i,
+    contains $warning, 'Dynamic schema',
         'dynamic schema in backcompat mode detected';
-    like $warning, qr/run in 0\.04006 mode/i,
+    contains $warning, 'run in 0.04006 mode',
         'dynamic schema in 0.04006 mode warning';
-    like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+    contains $warning, 'DBIx::Class::Schema::Loader::Manual::UpgradingFromV4',
         'warning refers to upgrading doc';
-    
+
     run_v4_tests($res);
 }
 
@@ -57,7 +59,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,
@@ -65,7 +67,7 @@ sub class_content_like;
 'content for unsingularized Result.';
 
     my $warning = $res->{warnings}[0];
-    like $warning, qr/Detected external content/i,
+    contains $warning, 'Detected external content',
         'detected external content warning';
 
     lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
@@ -102,7 +104,7 @@ sub class_content_like;
 'content for unsingularized Result with use_namespaces.';
 
     my $warning = $res->{warnings}[0];
-    like $warning, qr/Detected external content/i,
+    contains $warning, "Detected external content",
         'detected external content warning';
 
     lives_and { is $schema->resultset('Quux')->find(1)->a_method, 'hlagh' }
@@ -150,10 +152,10 @@ sub class_content_like;
 'unsingularized class names in external content from unchanged Result class ' .
 'names are translated in static schema';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/package ${SCHEMA_CLASS}::Quux;/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "package ${SCHEMA_CLASS}::Quux;",
 'package line translated correctly from external custom content in static dump';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
 'external custom content loaded into static dump correctly';
 }
 
@@ -164,11 +166,11 @@ sub class_content_like;
     my $res = run_loader(static => 1);
     my $warning = $res->{warnings}[1];
 
-    like $warning, qr/static schema/i,
+    contains $warning, "static schema",
         'static schema in backcompat mode detected';
-    like $warning, qr/0.04006/,
+    contains $warning, "0.04006",
         'correct version detected';
-    like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+    contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
         'refers to upgrading doc';
 
     is scalar @{ $res->{warnings} }, 4,
@@ -193,10 +195,10 @@ sub class_content_like;
     );
     my $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
         'correct warnings on upgrading static schema (with "naming" set)';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
         'correct warnings on upgrading static schema (with "naming" set)';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -216,7 +218,7 @@ sub class_content_like;
         $res->{classes}{bazs} }
         'unsingularized class names in custom content are translated';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from unsingularized Result loaded into static dump correctly';
 }
 
@@ -228,11 +230,11 @@ sub class_content_like;
     my $res = run_loader(static => 1);
     my $warning = $res->{warnings}[1];
 
-    like $warning, qr/static schema/i,
+    contains $warning, "static schema",
         'static schema in backcompat mode detected';
-    like $warning, qr/0.04006/,
+    contains $warning, "0.04006",
         'correct version detected';
-    like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+    contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
         'refers to upgrading doc';
 
     is scalar @{ $res->{warnings} }, 4,
@@ -251,15 +253,15 @@ sub class_content_like;
     );
     my $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/load_classes/i,
+    contains $res->{warnings}[0], "load_classes",
 'correct warnings on upgrading static schema (with "naming" set and ' .
 'use_namespaces not set)';
 
-    like $res->{warnings}[1], qr/Dumping manual schema/i,
+    contains $res->{warnings}[1], "Dumping manual schema",
 'correct warnings on upgrading static schema (with "naming" set and ' .
 'use_namespaces not set)';
 
-    like $res->{warnings}[2], qr/dump completed/i,
+    contains $res->{warnings}[2], "dump completed",
 'correct warnings on upgrading static schema (with "naming" set and ' .
 'use_namespaces not set)';
 
@@ -280,7 +282,7 @@ sub class_content_like;
         $res->{classes}{bazs} }
         'unsingularized class names in custom content are translated';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from unsingularized Result loaded into static dump correctly';
 }
 
@@ -299,11 +301,11 @@ sub class_content_like;
     my $res = run_loader(static => 1);
     my $warning = $res->{warnings}[0];
 
-    like $warning, qr/static schema/i,
+    contains $warning, "static schema",
         'static schema in backcompat mode detected';
-    like $warning, qr/0.04006/,
+    contains $warning, "0.04006",
         'correct version detected';
-    like $warning, qr/DBIx::Class::Schema::Loader::Manual::UpgradingFromV4/,
+    contains $warning, "DBIx::Class::Schema::Loader::Manual::UpgradingFromV4",
         'refers to upgrading doc';
 
     is scalar @{ $res->{warnings} }, 3,
@@ -329,11 +331,11 @@ sub class_content_like;
     );
     my $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on upgrading static schema (with "naming" set and ' .
 'use_namespaces => 0)';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on upgrading static schema (with "naming" set and ' .
 'use_namespaces => 0)';
 
@@ -372,10 +374,10 @@ sub class_content_like;
 'unsingularized class names in external content from unchanged Result class ' .
 'names are translated in static schema';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
 'external content from unsingularized Result loaded into static dump correctly';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom   content from unsingularized Result loaded into static dump correctly';
 }
 
@@ -389,10 +391,10 @@ sub class_content_like;
         naming => 'current',
     );
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on dumping static schema with use_namespaces => 0';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on dumping static schema with use_namespaces => 0';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -410,13 +412,13 @@ sub class_content_like;
     # load_classes is preserved
     $res = run_loader(static => 1, naming => 'current');
 
-    like $res->{warnings}[0], qr/load_classes/i,
+    contains $res->{warnings}[0], "load_classes",
 'correct warnings on re-dumping static schema with load_classes';
 
-    like $res->{warnings}[1], qr/Dumping manual schema/i,
+    contains $res->{warnings}[1], "Dumping manual schema",
 'correct warnings on re-dumping static schema with load_classes';
 
-    like $res->{warnings}[2], qr/dump completed/i,
+    contains $res->{warnings}[2], "dump completed",
 'correct warnings on re-dumping static schema with load_classes';
 
     is scalar @{ $res->{warnings} }, 3,
@@ -436,10 +438,10 @@ sub class_content_like;
     );
     $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on upgrading to use_namespaces';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on upgrading to use_namespaces';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -464,7 +466,7 @@ sub class_content_like;
         $res->{classes}{bazs} }
         'un-namespaced class names in custom content are translated';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from un-namespaced Result loaded into static dump correctly';
 }
 
@@ -473,10 +475,10 @@ sub class_content_like;
 {
     my $res = run_loader(clean_dumpdir => 1, static => 1, naming => 'current');
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on dumping static schema';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on dumping static schema';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -493,10 +495,10 @@ sub class_content_like;
     # test that with no use_namespaces option, use_namespaces is preserved
     $res = run_loader(static => 1, naming => 'current');
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on re-dumping static schema';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on re-dumping static schema';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -516,10 +518,10 @@ sub class_content_like;
     );
     my $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on downgrading to load_classes';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on downgrading to load_classes';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -546,7 +548,7 @@ sub class_content_like;
 'namespaced class names in custom content are translated during load_classes '.
 'downgrade';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from namespaced Result loaded into static dump correctly '.
 'during load_classes downgrade';
 }
@@ -561,10 +563,10 @@ sub class_content_like;
         naming => 'current',
     );
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on dumping static schema';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on dumping static schema';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -582,10 +584,10 @@ sub class_content_like;
     # the custom result_namespace is preserved
     $res = run_loader(static => 1, naming => 'current');
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on re-dumping static schema';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on re-dumping static schema';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -605,10 +607,10 @@ sub class_content_like;
     );
     my $schema = $res->{schema};
 
-    like $res->{warnings}[0], qr/Dumping manual schema/i,
+    contains $res->{warnings}[0], "Dumping manual schema",
 'correct warnings on downgrading to load_classes';
 
-    like $res->{warnings}[1], qr/dump completed/i,
+    contains $res->{warnings}[1], "dump completed",
 'correct warnings on downgrading to load_classes';
 
     is scalar @{ $res->{warnings} }, 2,
@@ -635,7 +637,7 @@ sub class_content_like;
 'namespaced class names in custom content are translated during load_classes '.
 'downgrade';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from namespaced Result loaded into static dump correctly '.
 'during load_classes downgrade';
 }
@@ -675,7 +677,7 @@ sub class_content_like;
         $res->{classes}{bazs} }
 'class names in custom content are translated when rewriting result_namespace';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from namespaced Result loaded into static dump correctly '.
 'when rewriting result_namespace';
 
@@ -717,11 +719,11 @@ sub class_content_like;
 'class names in external content are translated when rewriting '.
 'result_namespace';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub b_method { 'dongs' }",
 'custom content from namespaced Result loaded into static dump correctly '.
 'when rewriting result_namespace';
 
-    class_content_like $schema, $res->{classes}{quuxs}, qr/sub a_method { 'hlagh' }/,
+    class_content_contains $schema, $res->{classes}{quuxs}, "sub a_method { 'hlagh' }",
 'external content from unsingularized Result loaded into static dump correctly';
 }
 
@@ -733,8 +735,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;
@@ -769,7 +771,7 @@ sub class_content_like;
 'unsingularized class names in custom content from Result with unchanged ' .
 'name are translated';
 
-    class_content_like $schema, $res->{classes}{bar}, qr/sub b_method { 'dongs' }/,
+    class_content_contains $schema, $res->{classes}{bar}, "sub b_method { 'dongs' }",
 'custom content from Result with unchanged name loaded into static dump ' .
 'correctly';
 }
@@ -783,7 +785,7 @@ sub class_content_like;
 
     my $res = run_loader(static => 1);
 
-    like $res->{warnings}[0], qr/0.05003 static schema/, 'backcompat warning';
+    contains $res->{warnings}[0], "0.05003 static schema", 'backcompat warning';
 
     run_v5_tests($res);
 
@@ -829,7 +831,7 @@ sub class_content_like;
 
     my $res = run_loader(static => 1);
 
-    like $res->{warnings}[0], qr/0.06001 static schema/, 'backcompat warning';
+    contains $res->{warnings}[0], "0.06001 static schema", 'backcompat warning';
 
     run_v6_tests($res);
 
@@ -891,7 +893,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/;
@@ -1108,6 +1110,9 @@ sub run_v4_tests {
 
     ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
         'correct column accessor in 0.04006 mode');
+
+    is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+        'correct column accessor for column with word ending with digit in v4 mode';
 }
 
 sub run_v5_tests {
@@ -1135,6 +1140,9 @@ sub run_v5_tests {
 
     ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
         'correct column accessor in v5 mode');
+
+    is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+        'correct column accessor for column with word ending with digit in v5 mode';
 }
 
 sub run_v6_tests {
@@ -1167,6 +1175,9 @@ sub run_v6_tests {
 
     ok (($schema->resultset('Routechange')->find(1)->can('quuxsid')),
         'correct column accessor in v6 mode');
+
+    is $schema->resultset('Routechange')->find(1)->foo2bar, 3,
+        'correct column accessor for column with word ending with digit in v6 mode';
 }
 
 sub run_v7_tests {
@@ -1199,6 +1210,9 @@ sub run_v7_tests {
 
     ok (($schema->resultset('RouteChange')->find(1)->can('quuxs_id')),
         'correct column accessor in current mode');
+
+    is $schema->resultset('RouteChange')->find(1)->foo2_bar, 3,
+        'correct column accessor for column with word ending with digit in current mode';
 }
 
 {
@@ -1285,13 +1299,23 @@ sub _rel_condition {
     }->{_rel_key($from, $to)};
 }
 
-sub class_content_like {
-    my ($schema, $class, $re, $test_name) = @_;
+sub class_content_contains {
+    my ($schema, $class, $substr, $test_name) = @_;
+
+    my $file = $schema->loader->get_dump_filename($class);
+    my $code = slurp_file $file;
+
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    contains $code, $substr, $test_name;
+}
+
+sub contains {
+    my ($haystack, $needle, $test_name) = @_;
 
-    my $file = $schema->_loader->_get_dump_filename($class);
-    my $code = slurp $file;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-    like $code, $re, $test_name;
+    like $haystack, qr/\Q$needle\E/, $test_name;
 }
 
 sub add_custom_content {
@@ -1320,7 +1344,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 (<>) {