X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05in_between.t;h=f39b3e67270da92c365512a537ef6e4f97cb741e;hb=2fadf08e171ee68c239cec896075428ae21f2232;hp=2ae0172ae3cf61aac6e9e24ddf9c7f2fc29016eb;hpb=81b3e5853d6a59c8bf28ff03c96985f74f8c6781;p=scpubgit%2FQ-Branch.git diff --git a/t/05in_between.t b/t/05in_between.t index 2ae0172..f39b3e6 100644 --- a/t/05in_between.t +++ b/t/05in_between.t @@ -4,9 +4,8 @@ use strict; use warnings; use Test::More; use Test::Exception; -use SQL::Abstract::Test import => ['is_same_sql_bind']; +use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where)]; -use Data::Dumper; use SQL::Abstract; my @in_between_tests = ( @@ -225,25 +224,23 @@ for my $case (@in_between_tests) { local $TODO = $case->{todo} if $case->{todo}; local $SQL::Abstract::Test::parenthesis_significant = $case->{parenthesis_significant}; - local $Data::Dumper::Terse = 1; my @w; local $SIG{__WARN__} = sub { push @w, @_ }; + my $sql = SQL::Abstract->new ($case->{args} || {}); if ($case->{exception}) { throws_ok { $sql->where($case->{where}) } $case->{exception}; } else { - lives_ok { - my ($stmt, @bind) = $sql->where($case->{where}); - is_same_sql_bind( - $stmt, - \@bind, - $case->{stmt}, - $case->{bind}, - ) || diag "Search term:\n" . Dumper $case->{where}; - } "$case->{test} doesn't die"; + my ($stmt, @bind) = $sql->where($case->{where}); + is_same_sql_bind( + $stmt, + \@bind, + $case->{stmt}, + $case->{bind}, + ) || diag_where ( $case->{where} ); } is (@w, 0, $case->{test} || 'No warnings within in-between tests')