From: Peter Rabbitson Date: Thu, 4 Sep 2014 10:17:17 +0000 (+0200) Subject: Better optional diag in t/sqlmaker/dbihacks_internals.t X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ff7d03e645231bc360b686d7344f618ce8f5ac73;p=dbsrgits%2FDBIx-Class-Historic.git Better optional diag in t/sqlmaker/dbihacks_internals.t --- diff --git a/t/sqlmaker/dbihacks_internals.t b/t/sqlmaker/dbihacks_internals.t index ced331f..32ec846 100644 --- a/t/sqlmaker/dbihacks_internals.t +++ b/t/sqlmaker/dbihacks_internals.t @@ -8,6 +8,12 @@ use DBICTest ':DiffSQL'; use DBIx::Class::_Util 'UNRESOLVABLE_CONDITION'; use Data::Dumper; +BEGIN { + if ( eval { require Test::Differences } ) { + no warnings 'redefine'; + *is_deeply = \&Test::Differences::eq_or_diff; + } +} my $schema = DBICTest->init_schema( no_deploy => 1); my $sm = $schema->storage->sql_maker; @@ -128,6 +134,7 @@ for my $t ( efcc_result => {}, efcc_n_result => {}, } } ( + { -and => [ -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ], -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '!=' => \42 } }, @@ -137,6 +144,7 @@ for my $t ( -OR => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => 1 ], -or => { artistid => { '=' => 1 }, charfield => undef, rank => { '!=' => \42 } }, }, + ) ), { where => { -or => [ rank => { '=' => \13 }, charfield => { '=' => undef }, artistid => { '=' => 1 }, genreid => { '=' => \['?', 2] } ] }, @@ -390,6 +398,8 @@ for my $t ( $t->{efcc_n_result}, "Expected fixed_condition including NULLs produced on $name", ) if $t->{efcc_n_result}; + + die unless Test::Builder->new->is_passing; } }