switch from Test::More/Test::Most/Test::Fatal/etc to Test2::V0

iynehz · iynehz · commit 5e27cbedee9c · 2021-11-27T21:45:23.000+08:00
diff --git a/cpanfile b/cpanfile
@@ -69,10 +69,7 @@ on 'test' => sub {
   requires "Test2::Tools::PDL" => "0";
   requires "Test2::Tools::Warnings" => "0";
   requires "Test2::V0" => "0";
-  requires "Test::Fatal" => "0";
   requires "Test::File::ShareDir" => "0";
-  requires "Test::More" => "0";
-  requires "Test::Most" => "0";
 };
 
 on 'configure' => sub {
diff --git a/t/basic.t b/t/basic.t
@@ -1,10 +1,11 @@
-use Test::Most tests => 16;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
+
+use Test2::V0;
 
 use Data::Frame;
-use PDL;
+use PDL::Core qw(pdl);
 
 my $a = pdl(1, 2, 3, 4);
 my $b = $a >= 2;
@@ -28,37 +29,42 @@ is($df_hash->number_of_columns, 3);
 is($df_array->number_of_rows, 4);
 is($df_hash->number_of_rows, 4);
 
-is_deeply( $df_array->column_names, [ qw/z y x/ ] );
-is_deeply( $df_hash->column_names, [ qw/a b c/ ] );
+is( $df_array->column_names, [ qw/z y x/ ] );
+is( $df_hash->column_names, [ qw/a b c/ ] );
 
 is( $df_hash->column('c')->number_of_rows, 4);
-is_deeply( $df_hash->column('c')->unpdl, $c);
+is( $df_hash->column('c')->unpdl, $c);
 
-throws_ok { $df_hash->add_column( c => [1, 2, 3, 4] ) }
-	qr/column.*already exists/,
-	'exception for adding existing column';
+like(
+    dies { $df_hash->add_column( c => [ 1, 2, 3, 4 ] ) },
+    qr/column.*already exists/,
+    'exception for adding existing column'
+);
 
 $df_array->column_names(qw/a b c/);
-is_deeply( $df_array->column_names, [ qw/a b c/ ], 'renaming columns works' );
+is( $df_array->column_names, [ qw/a b c/ ], 'renaming columns works' );
 
-is_deeply( $df_array->row_names->unpdl, [ 0..3 ] );
+is( $df_array->row_names->unpdl, [ 0..3 ] );
 
-throws_ok
-	{ $df_array->column_names(qw/a b c d/); }
-	qr/incorrect number of column names/,
-	'setting more columns than exist';
+like(
+    dies { $df_array->column_names(qw/a b c d/); },
+    qr/incorrect number of column names/,
+    'setting more columns than exist'
+);
 
 is( $df_hash->nth_column(0)->number_of_rows, 4);
 is( $df_hash->nth_column(-1)->number_of_rows, 4);
 
-throws_ok
-	{ $df_hash->nth_column(3) }
-	qr/index out of bounds/,
-	'out of bounds column access';
-
-throws_ok
-	{ $df_hash->column('m') }
-	qr/column.*does not exist/,
-	'non-existent column';
+like(
+    dies { $df_hash->nth_column(3) },
+    qr/index out of bounds/,
+    'out of bounds column access'
+);
+
+like(
+    dies { $df_hash->column('m') },
+    qr/column.*does not exist/,
+    'non-existent column'
+);
 
 done_testing;
diff --git a/t/failures.t b/t/failures.t
@@ -1,13 +1,11 @@
 #!/usr/bin/env perl
 
-use strict; use warnings;
-use Test::More;
+use Data::Frame::Setup;
 
-use Data::Frame;
-use Test::Fatal;
-
-use PDL::Factor;
+use Test2::V0;
 
+use Data::Frame;
+use PDL::Factor ();
 
 subtest 'Data::Frame throws exception objects' => sub {
 
@@ -22,34 +20,31 @@ subtest 'Data::Frame throws exception objects' => sub {
 		],
 	);
 
+	isa_ok( dies { $a == $b }, 'failure::columns::mismatch' );
 
-	isa_ok( exception { $a == $b }, 'failure::columns::mismatch' );
+	isa_ok( dies { $a->column_names(qw/a b/) }, 'failure::columns::length' );
 
-	isa_ok( exception { $a->column_names(qw/a b/) }, 'failure::columns::length' );
+	isa_ok( dies { $a->row_names(qw/a b/) }, 'failure::rows::length' );
+	isa_ok( dies { $a->row_names(qw/a b b/) }, 'failure::rows::unique' );
 
-	isa_ok( exception { $a->row_names(qw/a b/) }, 'failure::rows::length' );
-	isa_ok( exception { $a->row_names(qw/a b b/) }, 'failure::rows::unique' );
-
-	isa_ok( exception { $a->column('ape') }, 'failure::column::exists' );
+	isa_ok( dies { $a->column('ape') }, 'failure::column::exists' );
 
 	#isa_ok( exception { $a->nth_column }, 'failure::index' );
-	isa_ok( exception { $a->nth_column(5) }, 'failure::index::exists' );
+	isa_ok( dies { $a->nth_column(5) }, 'failure::index::exists' );
 
-	isa_ok( exception { $a->add_column(1) }, 'failure::column::name::string' );
-	isa_ok( exception { $a->add_column(c => [1..4]) }, 'failure::rows::length' );
-	isa_ok( exception { $a->add_column('x') }, 'failure::column::exists' );
+	isa_ok( dies { $a->add_column(1) }, 'failure::column::name::string' );
+	isa_ok( dies { $a->add_column(c => [1..4]) }, 'failure::rows::length' );
+	isa_ok( dies { $a->add_column('x') }, 'failure::column::exists' );
 
-	isa_ok( exception { $a->add_columns(x => [1..3], 'y') }, 'failure::columns::unbalanced' );
+	isa_ok( dies { $a->add_columns(x => [1..3], 'y') }, 'failure::columns::unbalanced' );
 };
 
 subtest 'PDL::Factor throws exception objects' => sub {
 	my $a = PDL::Factor->new(['b'], levels => [qw/a b c/],);
 	my $b = PDL::Factor->new(['b'], levels => [qw/c b a/],);
 
-	isa_ok( exception { $a == $b }, 'failure::levels::mismatch' );
-
-
-	isa_ok( exception { $a->levels(qw/a b c d/) }, 'failure::levels::number' );
+	isa_ok( dies { $a == $b }, 'failure::levels::mismatch' );
+	isa_ok( dies { $a->levels(qw/a b c d/) }, 'failure::levels::number' );
 };
 done_testing;
 
diff --git a/t/pdl-factor.t b/t/pdl-factor.t
@@ -1,9 +1,10 @@
-use Test::Most tests => 16;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
 
-use PDL::Factor;
+use Test2::V0;
+
+use PDL::Factor ();
 
 my $data = [ qw[ a b c a b ] ];
 my $f = PDL::Factor->new( $data );
@@ -12,7 +13,7 @@ is( $f->nelem, 5 );
 
 is( $f->number_of_levels, 3 );
 
-cmp_set( $f->levels, [qw/a b c/] );
+is( $f->levels, [qw/a b c/] );
 
 is( "$f", "[ a b c a b ]", 'stringify' );
 
@@ -21,51 +22,32 @@ is( "@{[ $f->uniq ]}", "[ a b c ]" );
 # set levels
 my $f_set_levels = PDL::Factor->new( $data );
 $f_set_levels->levels(qw/z y x/);
-is_deeply( $f_set_levels->levels, [qw/z y x/] );
+is( $f_set_levels->levels, [qw/z y x/] );
 
-throws_ok
-	{ $f_set_levels->levels(qw/z y/); }
-	qr/incorrect number of levels/,
-	'setting too few levels';
+like(
+    dies { $f_set_levels->levels(qw/z y/); },
+    qr/incorrect number of levels/,
+    'setting too few levels'
+);
 
 EQUALITY: {
 	my $another_f = PDL::Factor->new( $data );
 	my $g = PDL::Factor->new( [ qw[a b a a c ] ] );
 	my $h = PDL::Factor->new( [ qw[x y z x y ] ] );
 
-	#use DDP; &p( $f!=$g );
 	ok( ($f == $another_f)->all, 'factor data is equal' );
 	ok( !( ($f == $g)->all ) , 'factor data is not equal' );
 	ok( ($f != $g)->any,       'factor data is not equal' );
 
-	throws_ok( sub { $f == $h; },
-		qr/level sets of factors are different/,
-		'error: different level sets' );
+    like(
+        dies { $f == $h; },
+        qr/level sets of factors are different/,
+        'error: different level sets'
+    );
 	ok( ($f->{PDL} == $h->{PDL})->all, 'but the internal values are the same');
 }
 
-TODO: { # CLONING
-	todo_skip "need to implement cloning", 3;
-
-	my $copy_of_f_0 = $f->copy;
-	my $copy_of_f_1 = PDL::Factor->new( $f );
-
-	is_deeply($copy_of_f_0->levels, $f->levels);
-
-	ok( $f == $copy_of_f_0 );
-
-	ok( $copy_of_f_0 == $copy_of_f_1 );
-
-	note $copy_of_f_0->PDL::Core::string;
-
-	# table( iris$Species )
-	# row.names( table( iris$Species ) )
-	# table( iris$Species ) / length( iris$Species )
-	# <http://www.cyclismo.org/tutorial/R/types.html>
-}
-
 subtest 'max width' => sub {
-	plan tests => 4;
 	my $width_data = [ qw[ a b cde fghi ]   ];
 	my $width_factor = PDL::Factor->new($width_data);
 	is( $width_factor->element_stringify_max_width, 4 );
diff --git a/t/pdl-stringifiable-ext.t b/t/pdl-stringifiable-ext.t
@@ -1,9 +1,11 @@
-use Test::Most tests => 7;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
 
-use PDL;
+use Test2::V0;
+
+use PDL::Basic qw(sequence);
+use PDL::Core qw(pdl);
 use PDL::StringfiableExtension;
 
 is( sequence(10)->element_stringify_max_width, 1 );
@@ -28,7 +30,6 @@ for (@each) {
 }
 
 subtest 'lengths' => sub {
-	plan tests => 3 * @each;
 	for my $data (@each) {
 		note $data->{val};
 		is( pdl($data->{val})->element_stringify_max_width, $data->{zerodim} );
diff --git a/t/pdl-sv.t b/t/pdl-sv.t
@@ -1,10 +1,10 @@
-use Test::Most tests => 7;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
 
-use PDL::SV;
+use Test2::V0;
 
+use PDL::SV ();
 use Math::BigInt;
 
 my $data = [ Math::BigInt->new('4'), Math::BigInt->new('3'), Math::BigInt->new('20'), Math::BigInt->new('2'), ];
diff --git a/t/rlike-TODO.t b/t/rlike-TODO.t
diff --git a/t/rlike.t b/t/rlike.t
@@ -1,10 +1,11 @@
-use Test::Most tests => 6;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
+
+use Test2::V0;
 
 use Data::Frame::Rlike;
-use PDL;
+use PDL::Basic qw(sequence);
 
 my $N  = 42;
 my $first_x = 0;
diff --git a/t/subset.t b/t/subset.t
@@ -1,10 +1,11 @@
-use Test::Most;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
+
+use Test2::V0;
 
 use Data::Frame;
-use PDL;
+use PDL::Core qw(pdl);
 
 my $a = pdl( 1, 2, 3, 4 );
 my $b = $a >= 2;
@@ -36,13 +37,13 @@ subtest number_of_rows => sub {
 
 subtest subset => sub {
     my $df_subset = $df->subset( sub { $_->('z') > 2 } );
-    is_deeply( $df_subset->row_names->unpdl, [ 2 .. 3 ] );
+    is( $df_subset->row_names->unpdl, [ 2 .. 3 ] );
 
     my $df_subset_autoload = $df->subset( sub { $_->z > 2 } );
-    is_deeply( $df_subset_autoload->row_names->unpdl, [ 2 .. 3 ] );
+    is( $df_subset_autoload->row_names->unpdl, [ 2 .. 3 ] );
 
     my $df_subset_further = $df_subset->subset( sub { $_->('z') == 3 } );
-    is_deeply( $df_subset_further->row_names->unpdl, [2] );
+    is( $df_subset_further->row_names->unpdl, [2] );
 };
 
 done_testing;
diff --git a/t/traits.t b/t/traits.t
@@ -1,10 +1,11 @@
-use Test::Most tests => 2;
+#!perl
 
-use strict;
-use warnings;
+use Data::Frame::Setup;
+
+use Test2::V0;
 
 use Data::Frame;
-use PDL;
+use PDL::Basic qw(sequence);
 
 my $N  = 5;
 my $colspec = [ x => sequence($N), y => 3 * sequence($N) ];
