switch to useint Test::Exception instead of the home made code, remote test.pm

[term-progressbar.git] / t / v2-simple.t

diff --git a/t/v2-simple.t b/t/v2-simple.t
index 5b300ba6a153d2d086c81b1878027084685e0b14..4816ab989ad012fad2015a1053989572f93cf676 100644 (file)
--- a/t/v2-simple.t
+++ b/t/v2-simple.t
@@ -9,30 +9,12 @@ This package tests the basic functionality of Term::ProgressBar.
 =cut
 
 use Data::Dumper qw( Dumper );
-use FindBin      qw( $Bin );
-use Test         qw( ok plan );
-
-use lib $Bin;
-use test qw( evcheck );
+use Test::More tests => 31;
+use Test::Exception;
 
 use Capture::Tiny qw(capture);
 
-BEGIN {
-  # 1 for compilation test,
-  plan tests  => 31,
-       todo   => [],
-}
-
-=head2 Test 1: compilation
-
-This test confirms that the test script and the modules it calls compiled
-successfully.
-
-=cut
-
-use Term::ProgressBar;
-
-ok 1, 1, 'compilation';
+use_ok 'Term::ProgressBar';
 
 Term::ProgressBar->__force_term (50);
 
@@ -54,18 +36,16 @@ Update it it from 1 to 10.
   my $p;
 
 my ($out, $err) = capture {
-  ok (evcheck(sub { $p = Term::ProgressBar->new(10); }, 'Count 1-10 (1)' ),
-      1, 'Count 1-10 (1)');
-  ok (evcheck(sub { $p->update($_) for 1..10 }, 'Count 1-10 (2)' ),
-      1, 'Count 1-10 (2)');
+  lives_ok { $p = Term::ProgressBar->new(10); } 'Count 1-10 (1)';
+  lives_ok { $p->update($_) for 1..10 } 'Count 1-10 (2)';
 };
 print $out;
   my @lines = grep $_ ne '', split /\r/, $err;
   print Dumper \@lines
     if $ENV{TEST_DEBUG};
-  ok $lines[-1], qr/\[=+\]/,            'Count 1-10 (3)';
-  ok $lines[-1], qr/^\s*100%/,          'Count 1-10 (4)';
-  ok $lines[$_], qr/\[[= ]+\]/, sprintf('Count 1-10 (%d)', 5+$_)
+  like $lines[-1], qr/\[=+\]/,            'Count 1-10 (3)';
+  like $lines[-1], qr/^\s*100%/,          'Count 1-10 (4)';
+  like $lines[$_], qr/\[[= ]+\]/, sprintf('Count 1-10 (%d)', 5+$_)
     for 0..10;
 }
 # -------------------------------------
@@ -87,19 +67,17 @@ Update it it from 1 to 9.
   my $p;
 
 my ($out, $err) = capture {
-  ok (evcheck(sub { $p = Term::ProgressBar->new(10); }, 'Count 1-9 (1)' ),
-      1, 'Count 1-9 (1)');
-  ok (evcheck(sub { $p->update($_) for 1..9 }, 'Count 1-9 (2)' ),
-      1, 'Count 1-9 (2)');
+  lives_ok { $p = Term::ProgressBar->new(10); } 'Count 1-9 (1)';
+  lives_ok { $p->update($_) for 1..9 } 'Count 1-9 (2)';
 };
 print $out;
 
   my @lines = grep $_ ne '', split /\r/, $err;
   print Dumper \@lines
     if $ENV{TEST_DEBUG};
-  ok $lines[-1], qr/\[=+ +\]/,          'Count 1-9 (3)';
-  ok $lines[-1], qr/^\s*90%/,           'Count 1-9 (4)';
-  ok $lines[$_], qr/\[[= ]+\]/, sprintf('Count 1-9 (%d)', 5+$_)
+  like $lines[-1], qr/\[=+ +\]/,          'Count 1-9 (3)';
+  like $lines[-1], qr/^\s*90%/,           'Count 1-9 (4)';
+  like $lines[$_], qr/\[[= ]+\]/, sprintf('Count 1-9 (%d)', 5+$_)
     for 0..9;
 }
 # -------------------------------------
@@ -120,5 +98,5 @@ print $out;
   my @lines = grep $_ ne '', split /\r/, $err;
   print Dumper \@lines
     if $ENV{TEST_DEBUG};
-  ok scalar @lines, 1;
+  is scalar @lines, 1;
 }