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

diff --git a/t/25backcompat.t b/t/25backcompat.t
index eaa97bd..477f654 100644
--- a/t/25backcompat.t
+++ b/t/25backcompat.t
@@ -6,8 +6,8 @@ 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;
@@ -19,20 +19,21 @@ 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);
 }
 
@@ -66,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' }
@@ -103,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' }
@@ -151,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';
 }
 
@@ -165,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,
@@ -194,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,
@@ -217,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';
 }
 
@@ -229,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,
@@ -252,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)';
 
@@ -281,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';
 }
 
@@ -300,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,
@@ -330,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)';
 
@@ -373,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';
 }
 
@@ -390,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,
@@ -411,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,
@@ -437,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,
@@ -465,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';
 }
 
@@ -474,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,
@@ -494,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,
@@ -517,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,
@@ -547,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';
 }
@@ -562,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,
@@ -583,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,
@@ -606,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,
@@ -636,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';
 }
@@ -676,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';
 
@@ -718,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';
 }
 
@@ -735,7 +736,7 @@ sub class_content_like;
     my $schema = $res->{schema};
 
     my $file = $schema->loader->get_dump_filename($SCHEMA_CLASS);
-    my $code = slurp $file;
+    my $code = slurp_file $file;
 
     my ($dumped_ver) =
         $code =~ /^# Created by DBIx::Class::Schema::Loader v(\S+)/m;
@@ -770,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';
 }
@@ -784,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);
 
@@ -830,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);
 
@@ -1298,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;
+    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) = @_;
+
+    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 {