X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Fdebug.t;h=37003baf08bf2f37a3f3dd891e25b982ff9573f7;hb=0e773352a9c6c034dfb2526b8d68bf6ac1e2323b;hp=480ad6e06876c71a04a6ab47db5dd462ddb73a66;hpb=c9d29bb255e00c9c734edfc9634b3ff24ad621ba;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/storage/debug.t b/t/storage/debug.t
index 480ad6e..37003ba 100644
--- a/t/storage/debug.t
+++ b/t/storage/debug.t
@@ -1,7 +1,8 @@
 use strict;
-use warnings; 
+use warnings;
 
 use Test::More;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::DebugObj;
@@ -10,6 +11,8 @@ use Path::Class qw/file/;
 
 my $schema = DBICTest->init_schema();
 
+# make sure we are testing the vanilla debugger and not ::PrettyPrint
+$schema->storage->debugobj(DBIx::Class::Storage::Statistics->new);
 
 ok ( $schema->storage->debug(1), 'debug' );
 $schema->storage->debugfh(file('t/var/sql.log')->openw);
@@ -21,7 +24,7 @@ $rs->count();
 my $log = file('t/var/sql.log')->openr;
 my $line = <$log>;
 $log->close();
-ok($line =~ /^SELECT COUNT/, 'Log success');
+like($line, qr/^SELECT COUNT/, 'Log success');
 
 $schema->storage->debugfh(undef);
 $ENV{'DBIC_TRACE'} = '=t/var/foo.log';
@@ -30,17 +33,18 @@ $rs->count();
 $log = file('t/var/foo.log')->openr;
 $line = <$log>;
 $log->close();
-ok($line =~ /^SELECT COUNT/, 'Log success');
+like($line, qr/^SELECT COUNT/, 'Log success');
 $schema->storage->debugobj->debugfh(undef);
 delete($ENV{'DBIC_TRACE'});
+
 open(STDERRCOPY, '>&STDERR');
 stat(STDERRCOPY); # nop to get warnings quiet
 close(STDERR);
-eval {
+dies_ok {
     $rs = $schema->resultset('CD')->search({});
     $rs->count();
-};
-ok($@, 'Died on closed FH');
+} 'Died on closed FH';
+
 open(STDERR, '>&STDERRCOPY');
 
 # test trace output correctness for bind params
@@ -51,7 +55,7 @@ open(STDERR, '>&STDERRCOPY');
     my @cds = $schema->resultset('CD')->search( { artist => 1, cdid => { -between => [ 1, 3 ] }, } );
     is_same_sql_bind(
         $sql, \@bind,
-        "SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( artist = ? AND (cdid BETWEEN ? AND ?) ): '1', '1', '3'",
+        "SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( artist = ? AND (cdid BETWEEN ? AND ?) )",
         [qw/'1' '1' '3'/],
         'got correct SQL with all bind parameters (debugcb)'
     );