From: Alexander Hartmaier Date: Thu, 14 Jul 2011 13:54:54 +0000 (+0200) Subject: replaced Test::Deep::NoTest with Data::Compare to not break Test::Deep tests X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9859bf7a4ab106f41a4373d8910a84f820e2fcf8;p=dbsrgits%2FDBIx-Class-Historic.git replaced Test::Deep::NoTest with Data::Compare to not break Test::Deep tests --- diff --git a/Makefile.PL b/Makefile.PL index 90da52b..3965ae8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -75,6 +75,7 @@ my $runtime_requires = { 'SQL::Abstract' => '1.72', 'Test::Deep' => '0.108', 'Try::Tiny' => '0.04', + 'Data::Compare' => '1.22', # XS (or XS-dependent) libs 'DBI' => '1.57', diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index b12fca7..bf4b1d8 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -8,7 +8,7 @@ use DBIx::Class::Exception; use DBIx::Class::ResultSetColumn; use Scalar::Util qw/blessed weaken/; use Try::Tiny; -use Test::Deep::NoTest 'eq_deeply'; +use Data::Compare; # not importing first() as it will clash with our own method use List::Util (); @@ -569,7 +569,7 @@ sub _stack_cond { for (grep { exists $right->{$_} } keys %$left) { # the use of eq_deeply here is justified - the rhs of an # expression can contain a lot of twisted weird stuff - delete $right->{$_} if eq_deeply( $left->{$_}, $right->{$_} ); + delete $right->{$_} if Compare( $left->{$_}, $right->{$_} ); } $right = undef unless keys %$right; diff --git a/t/53lean_startup.t b/t/53lean_startup.t index 19e6945..83e7dc8 100644 --- a/t/53lean_startup.t +++ b/t/53lean_startup.t @@ -45,7 +45,7 @@ BEGIN { Class::Accessor::Grouped Class::C3::Componentised - Test::Deep::NoTest + Data::Compare /, $] < 5.010 ? 'MRO::Compat' : () }; $test_hook = sub {