zap pointless use of Test2::V0

PDLPorters · Jan 10, 2024 · d569b25 · d569b25
1 parent d63fcae
commit d569b25
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 88 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -227,7 +227,6 @@ my %makefile_hash = (
     'IPC::Cmd' => '0.72',
     'Test::Exception' => 0,
     'Test::Warn' => 0,  # for t/pptest.t
-    'Test2::V0'  => 0.000155,
   },
   BUILD_REQUIRES => {
     'ExtUtils::MakeMaker' => 0,

diff --git a/t/primitive/append.t b/t/primitive/append.t
@@ -1,16 +1,16 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
-
+use Test::More;
+use Test::Exception;
 use PDL::LiteF;
 
-is(
+is_deeply(
     append( zeroes( 2, 0 ), zeroes( 3, 0 ) )->shape->unpdl,
     [ 5, 0 ],
     'multi-dim empty shape'
 );
 
-is( append( pdl( 1, 2, 3, 4 ), 2 )->unpdl, [ 1, 2, 3, 4, 2 ], '[4], [1]' );
+is_deeply( append( pdl( 1, 2, 3, 4 ), 2 )->unpdl, [ 1, 2, 3, 4, 2 ], '[4], [1]' );
 
 subtest '$output = append (null,null) ' => sub {
     my $output = append( null, null );
@@ -21,27 +21,30 @@ subtest '$output = append (null,null) ' => sub {
 subtest 'append(null, null, $output)' => sub {
     my $output = zeroes(1);
     append( null, null, $output );
-    is( $output->unpdl, [0], q{user's ndarray is unchanged} );
+    is_deeply( $output->unpdl, [0], q{user's ndarray is unchanged} );
 };
 
 subtest 'output ndarray has different shape' => sub {
 
-    todo 'output => [1]; required [2].  SHOULD FAIL, output too small' => sub {
+    TODO: {
+      local $TODO = 'not fixed yet';
+      subtest 'output => [1]; required [2].  output too small' => sub {
         my $output = zeroes(1);
-        like ( dies { append( pdl(1), pdl(2), $output ) },
-               qr/dim has size 1/ );
-    };
+        throws_ok { append( pdl(1), pdl(2), $output ) }
+               qr/dim has size 1/;
+      };
+    }
 
     subtest 'output => [3,1]; required [2]' => sub {
         my $output = zeroes(3,1);
-        like ( dies { append( pdl(1), pdl(2), $output ) },
-               qr/dim has size 3/ );
+        throws_ok { append( pdl(1), pdl(2), $output ) }
+               qr/dim has size 3/;
     };
 
     subtest 'output => null; required [2]' => sub {
         my $output = null;
         append( pdl(1), pdl(2), $output );
-        is( $output->unpdl, [ 1, 2 ], q{full append } );
+        is_deeply( $output->unpdl, [ 1, 2 ], q{full append } );
     };
 
 };

diff --git a/t/primitive/clip.t b/t/primitive/clip.t
@@ -1,4 +1,4 @@
-use Test2::V0 '!float';
+use Test::More;
 use PDL::LiteF;
 
 sub IM {
@@ -11,10 +11,9 @@ sub IM {
             [ 10, 10, 2,  2,  2, ]
         ]
     );
-
 }
 
-is(
+is_deeply(
     IM->hclip(5)->unpdl,
     [
         [ 1, 2, 3, 3, 5 ],
@@ -26,7 +25,7 @@ is(
     'hclip'
 );
 
-is(
+is_deeply(
     IM->lclip(5)->unpdl,
     [
         [ 5,  5,  5,  5,  5 ],
@@ -38,7 +37,7 @@ is(
     'lclip'
 );
 
-is(
+is_deeply(
     IM->clip( 5, 7 )->unpdl,
     [
         [ 5, 5, 5, 5, 5 ],
@@ -56,7 +55,7 @@ subtest 'with NaN badvalue' => sub {
     $im->badflag(1);
     $im->set( 1, nan() );
     my $clipped = $im->lclip(0);
-    is $clipped->unpdl, [0, 'BAD', 2], 'ISBAD() works when badvalue is NaN';
+    is_deeply $clipped->unpdl, [0, 'BAD', 2], 'ISBAD() works when badvalue is NaN';
 };
 
 done_testing;
diff --git a/t/primitive/interpolate.t b/t/primitive/interpolate.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
-
+use Test::More;
+use Test::Exception;
 use PDL::LiteF;
 
 subtest interpol => sub {
@@ -19,17 +19,12 @@ subtest interpol => sub {
         my $x       = PDL->new(-2);
 
 
-        # this is really awkward, but can be fixed.  Test2::V0's is()
-        # is very strict when comparing objects, Test2::PDL's functionality
-        # could be brought in.
         ok( all( $x->interpol( $xvalues, $yvalues ) == ( -16 - 16 * i ) ),
             "result" );
 
-        like(
-            dies { $x->interpol( $xvalues * i(), $yvalues ) },
+        throws_ok { $x->interpol( $xvalues * i(), $yvalues ) }
             qr/must be real/,
-            "x must be real"
-        );
+            "x must be real";
     };
 
 };
@@ -41,7 +36,7 @@ subtest interpND => sub {
       ->reorder( 2, 0, 1 );
     my $z = 73 + xvals( 5, 5 ) * 0.25 + 2.5 * yvals( 5, 5 );
     my $y;
-    ok( lives { $y = $x->interpND($index) }, 'interpND' ) or diag $@;
+    lives_ok { $y = $x->interpND($index) } 'interpND';
     ok !any( $y != $z ), "result";
 };
 

diff --git a/t/primitive/matmult.t b/t/primitive/matmult.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
-
+use Test::More;
+use Test::Exception;
 use PDL::LiteF;
 use lib 't/lib';
 use My::Test::Primitive;
@@ -27,7 +27,7 @@ subtest 'complex' => sub {
     my $cm1 = pdl('1 1+i 1');
     my $cm2 = pdl('2 3 i')->transpose;
     ok tapprox( $cm1 x $cm2, pdl('[[5+4i]]') ), 'complex matmult';
-    like dies { scalar $cm1->transpose x $cm2 },
+    throws_ok { scalar $cm1->transpose x $cm2 }
       qr/mismatch/,
       'good error on mismatch matmult';
 };
@@ -67,13 +67,11 @@ subtest 'output = ones(2,3)' => sub {
 ok tapprox( EQ() x PB(), pdl( [ [ 2, 6 ] ] ) ), '([4x1] x [2x4] -> [1x2])';
 
 # Check dimensional exception: mismatched dims should throw an error
-like(
-    dies {
+throws_ok {
         PB() x EQ();
-    },
+    }
     qr/mismatch in matmult/,
-    '[2x4] x [4x1] --> error (2 != 1)'
-);
+    '[2x4] x [4x1] --> error (2 != 1)';
 
 ok tapprox( PB() x 2, PB() * 2, 'ndarray x Perl scalar' );
 

diff --git a/t/primitive/misc.t b/t/primitive/misc.t
@@ -1,4 +1,4 @@
-use Test2::V0 '!float';
+use Test::More;
 use PDL::LiteF;
 use PDL::Types;
 
@@ -46,7 +46,7 @@ subtest glue => sub {
     my $y = yvals( 2, 2, 2 );
     my $c = zvals( 2, 2, 2 );
 
-    is $x->glue( 1, $y, $c )->unpdl,
+    is_deeply $x->glue( 1, $y, $c )->unpdl,
       [
         [ [ 0, 1 ], [ 0, 1 ], [ 0, 0 ], [ 1, 1 ], [ 0, 0 ], [ 0, 0 ] ],
         [ [ 0, 1 ], [ 0, 1 ], [ 0, 0 ], [ 1, 1 ], [ 1, 1 ], [ 1, 1 ] ]

diff --git a/t/primitive/random.t b/t/primitive/random.t
@@ -1,12 +1,12 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
-
+use Test::More;
+use Test::Exception;
 use PDL::LiteF;
 use lib 't/lib';
 use My::Test::Primitive;
 
-todo 'Some CPAN Testers fails for OpenBSD' => sub {
+TODO: { local $TODO = 'Some CPAN Testers fails for OpenBSD'; subtest 'random' => sub {
 
     # check that our random functions work with Perl's srand
     # local $TODO = ;
@@ -26,21 +26,19 @@ todo 'Some CPAN Testers fails for OpenBSD' => sub {
         my $r2 = grandom 10;
         ok( tapprox( $r1, $r2 ), "grandom and srand" );
     };
-};
+}; }
 
 subtest 'types' => sub {
 
     subtest 'random' => sub {
         my $type;
-        ok( lives { $type = random()->type }, 'random()' )
-          or note $@;
+        lives_ok { $type = random()->type } 'random()';
         is( $type, 'double', 'defaults to double' );
     };
 
     subtest 'randsym' => sub {
         my $type;
-        ok( lives { $type = randsym()->type }, 'randsym()' )
-          or note $@;
+        lives_ok { $type = randsym()->type } 'randsym()';
         is( $type, 'double', 'defaults to double' );
 
     };
@@ -49,7 +47,7 @@ subtest 'types' => sub {
 subtest 'regressions' => sub {
 
     # Test some operations with empty ndarrays
-    ok lives { random( 1, 1, 0 )->type }, 'empty ndarray';    # used to segfault
+    lives_ok { random( 1, 1, 0 )->type } 'empty ndarray';    # used to segfault
 };
 
 done_testing;
diff --git a/t/primitive/selector.t b/t/primitive/selector.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
-
+use Test::More;
+use Test::Exception;
 use PDL::LiteF;
 
 use lib 't/lib';
@@ -29,15 +29,15 @@ subtest 'where' => sub {
 
     subtest 'whereND' => sub {
 
-        is( [ zeroes( 2, 3, 1 )->whereND( pdl '0 0' )->dims ], [ 0, 3, 1 ] );
+        is_deeply( [ zeroes( 2, 3, 1 )->whereND( pdl '0 0' )->dims ], [ 0, 3, 1 ] );
 
-        is( [ zeroes( 2, 0 )->whereND( pdl '1 1' )->dims ], [ 2, 0 ] );
+        is_deeply( [ zeroes( 2, 0 )->whereND( pdl '1 1' )->dims ], [ 2, 0 ] );
 
         subtest '1D' => sub {
             my $x = sequence( 4, 3, 2 );
             my $y = pdl( 0, 1, 1, 0 );
             my $c = whereND( $x, $y );
-            is( [ $c->dims ], [ 2, 3, 2 ] );
+            is_deeply( [ $c->dims ], [ 2, 3, 2 ] );
             ok tapprox(
                 $c, pdl q[[[1 2] [5 6] [9 10]] [[13 14] [17 18] [21 22]]]
               ),
@@ -49,7 +49,7 @@ subtest 'where' => sub {
             my $y = pdl q[ 0 0 1 1 ; 0 1 0 0 ; 1 0 0 0 ];
 
             my $c = whereND( $x, $y );
-            is( [ $c->dims ], [ 4, 2 ] );
+            is_deeply( [ $c->dims ], [ 4, 2 ] );
             ok tapprox( $c, pdl q[ 2  3  5  8 ; 14 15 17 20 ] ), "[4,3]";
         };
 
@@ -65,7 +65,7 @@ subtest 'where' => sub {
             # Make sure whereND functions as an lvalue:
             my $x = sequence( 4, 3 );
             my $y = pdl( 0, 1, 1, 1 );
-            ok( lives { $x->whereND($y) *= -1 }, 'lvalue multiply' );
+            lives_ok { $x->whereND($y) *= -1 } 'lvalue multiply';
             ok( all( $x->slice("1:-1") < 0 ),    'works' );
         };
 
@@ -118,7 +118,7 @@ subtest 'which' => sub {
             my $r = xvals( 10, 10 ) + 10 * yvals( 10, 10 );
             my $x = whichND( $r % 12 == 0 );
 
-            is(
+            is_deeply(
                 $x->unpdl,
                 [
                     [ 0, 0 ], [ 2, 1 ], [ 4, 2 ], [ 6, 3 ],
@@ -133,7 +133,7 @@ subtest 'which' => sub {
             my $r = xvals( 10, 10 ) + 10 * yvals( 10, 10 );
             my $x = whichND( $r * 0 );
             is $x->nelem, 0, "whichND( 0*\$r ) gives an Empty PDL";
-            is( [ $x->dims ], [ 2, 0 ], "whichND( 0*\$r ) is 2x0" );
+            is_deeply( [ $x->dims ], [ 2, 0 ], "whichND( 0*\$r ) is 2x0" );
             is $x->type, 'indx', "whichND( 0*\$r) type is indx";
         };
 
@@ -147,7 +147,7 @@ subtest 'which' => sub {
         subtest 'Scalar empty case returns a 1-D vector of size 0' => sub {
             my $x = whichND( pdl(0) );
             is $x->nelem,    0,   "whichND of 0 scalar is empty";
-            is [ $x->dims ], [0], "whichND of 0 scalar: return 0 dim size is 0";
+            is_deeply [ $x->dims ], [0], "whichND of 0 scalar: return 0 dim size is 0";
             is $x->type, 'indx',
               "returns indx-type ndarray for scalar empty case";
         };
@@ -160,13 +160,13 @@ subtest 'which' => sub {
 
         subtest 'whichND(Empty[2x0x2]) should return Empty[3x0]' => sub {
             my $y = whichND( zeroes( 2, 0, 2 ) );
-            is [ $y->dims ], [ 3, 0 ];
+            is_deeply [ $y->dims ], [ 3, 0 ];
         };
 
         subtest 'regression' => sub {
             my $r = zeroes( 7, 7 );
             $r->set( 3, 4, 1 );
-            is( $r->whichND->unpdl, [ [ 3, 4 ] ], 'was failing on 32-bit' );
+            is_deeply( $r->whichND->unpdl, [ [ 3, 4 ] ], 'was failing on 32-bit' );
         };
 
         subtest 'torture test' => sub {
@@ -191,7 +191,7 @@ subtest 'uniqind' => sub {
 
     my $x = pdl( [ 0, 1, 2, 2, 0, 1 ] );
     my $y = $x->uniqind;
-    is( $y->unpdl, [ 0, 1, 3 ] );
+    is_deeply( $y->unpdl, [ 0, 1, 3 ] );
     is $y->ndims, 1, "uniqind";
 
     subtest 'SF bug 3076570' => sub {

diff --git a/t/primitive/setops.t b/t/primitive/setops.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
+use Test::More;
 
 use PDL::LiteF;
 use lib 't/lib';

diff --git a/t/primitive/stats.t b/t/primitive/stats.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test2::V0 '!float';
+use Test::More;
 
 use PDL::LiteF;
 use lib 't/lib';