X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fprefetch%2Fmultiple_hasmany.t;h=7af0888a315d8f8cbd1c0ed423456b520854425b;hb=c8b1011e62b44d8a35b5de0ec8e7ace99879c7af;hp=31b2585817814f67068ed189bc4c526eb1af924a;hpb=fe0708a2d68b5d34b6bc6f7e70164c3e569f1dd0;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/prefetch/multiple_hasmany.t b/t/prefetch/multiple_hasmany.t
index 31b2585..7af0888 100644
--- a/t/prefetch/multiple_hasmany.t
+++ b/t/prefetch/multiple_hasmany.t
@@ -1,12 +1,14 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
-use lib qw(t/lib);
+use Test::Warn;
+
 use DBICTest;
 
 my $schema = DBICTest->init_schema();
-my $sdebug = $schema->storage->debug;
 
 #( 1 -> M + M )
 my $cd_rs = $schema->resultset('CD')->search( { 'me.title' => 'Forkful of bees' } );
@@ -15,33 +17,24 @@ my $pr_cd_rs = $cd_rs->search( {}, { prefetch => [qw/tracks tags/], } );
 my $tracks_rs    = $cd_rs->first->tracks;
 my $tracks_count = $tracks_rs->count;
 
-my ( $pr_tracks_rs, $pr_tracks_count );
+$schema->is_executed_querycount( sub {
+  my $pcr = $pr_cd_rs;
+  my $pr_tracks_rs;
 
-my $queries = 0;
-$schema->storage->debugcb( sub { $queries++ } );
-$schema->storage->debug(1);
+  warnings_exist {
+    $pr_tracks_rs = $pcr->first->tracks;
+  } [], 'no warning on attempt to prefetch several same level has_many\'s (1 -> M + M)' ;
 
-my $o_mm_warn;
-{
-    local $SIG{__WARN__} = sub { $o_mm_warn = shift };
-    $pr_tracks_rs = $pr_cd_rs->first->tracks;
-};
-$pr_tracks_count = $pr_tracks_rs->count;
+  is( $pr_tracks_rs->count, $tracks_count,
+    'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)'
+  );
 
-ok( !$o_mm_warn,
-'no warning on attempt to prefetch several same level has_many\'s (1 -> M + M)'
-);
+  is( $pr_tracks_rs->all, $tracks_count,
+    'equal amount of objects returned with and without prefetch over several same level has_many\'s (1 -> M + M)'
+  );
 
-is( $queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query' );
-$schema->storage->debugcb(undef);
-$schema->storage->debug($sdebug);
+}, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query' );
 
-is( $pr_tracks_count, $tracks_count,
-'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)'
-);
-is( $pr_tracks_rs->all, $tracks_rs->all,
-'equal amount of objects returned with and without prefetch over several same level has_many\'s (1 -> M + M)'
-);
 
 #( M -> 1 -> M + M )
 my $note_rs =
@@ -52,32 +45,22 @@ my $pr_note_rs =
 my $tags_rs    = $note_rs->first->cd->tags;
 my $tags_count = $tags_rs->count;
 
-my ( $pr_tags_rs, $pr_tags_count );
-
-$queries = 0;
-$schema->storage->debugcb( sub { $queries++ } );
-$schema->storage->debug(1);
-
-my $m_o_mm_warn;
-{
-    local $SIG{__WARN__} = sub { $m_o_mm_warn = shift };
-    $pr_tags_rs = $pr_note_rs->first->cd->tags;
-};
-$pr_tags_count = $pr_tags_rs->count;
-
-ok( !$m_o_mm_warn,
-'no warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)'
-);
-
-is( $queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query' );
-$schema->storage->debugcb(undef);
-$schema->storage->debug($sdebug);
-
-is( $pr_tags_count, $tags_count,
-'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)'
-);
-is( $pr_tags_rs->all, $tags_rs->all,
-'equal amount of objects with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)'
-);
+$schema->is_executed_querycount( sub {
+  my $pnr = $pr_note_rs;
+  my $pr_tags_rs;
+
+  warnings_exist {
+    $pr_tags_rs = $pnr->first->cd->tags;
+  } [], 'no warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)';
+
+  is( $pr_tags_rs->count, $tags_count,
+    'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)'
+  );
+  is( $pr_tags_rs->all, $tags_count,
+    'equal amount of objects with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)'
+  );
+
+}, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query' );
+
 
 done_testing;