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

[term-progressbar.git] / t / zero.t

diff --git a/t/zero.t b/t/zero.t
index 7461163054fb3bf1cf0bf346715d471b63418b72..ffabda91e980f4a98ac924043c7f8a73799a81d0 100644 (file)
--- a/t/zero.t
+++ b/t/zero.t
@@ -9,30 +9,12 @@ This package tests the zero-progress handling of progress bar.
 =cut
 
 use Data::Dumper qw( Dumper );
-use FindBin      qw( $Bin );
-use Test         qw( ok plan );
+use Test::More tests => 9;
+use Test::Exception;
 
 use Capture::Tiny qw(capture);
 
-use lib $Bin;
-use test qw( evcheck );
-
-BEGIN {
-  # 1 for compilation test,
-  plan tests  => 9,
-       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);
 
@@ -55,18 +37,15 @@ Update it it from 1 to 10.
   my $name;
 my ($out, $err)  = capture {
   $name = 'doing nothing';
-  ok (evcheck(sub { $p = Term::ProgressBar->new($name, 0); },
-        'V1 mode ( 1)' ),
-      1,                                                       'V1 mode ( 1)');
-  ok (evcheck(sub { $p->update($_) for 1..10 },'V1 mode ( 2)'),
-      1,                                                       'V1 mode ( 2)');
+  lives_ok { $p = Term::ProgressBar->new($name, 0); } 'V1 mode ( 1)';
+  lives_ok { $p->update($_) for 1..10 } 'V1 mode ( 2)';
 };
 print $out;
   my @lines = grep $_ ne '', split /\r/, $err;
   print Dumper \@lines
     if $ENV{TEST_DEBUG};
-  ok $lines[-1], qr/^$name:/,                                  'V1 mode ( 3)';
-  ok $lines[-1], qr/\(nothing to do\)/,                        'V1 mode ( 4)';
+  like $lines[-1], qr/^$name:/,                                  'V1 mode ( 3)';
+  like $lines[-1], qr/\(nothing to do\)/,                        'V1 mode ( 4)';
 }
 
 # -------------------------------------
@@ -87,19 +66,15 @@ Update it it from 1 to 10.
   my $p;
   my $name = 'zero';
 my ($out, $err) = capture {
-  ok (evcheck(sub { $p = Term::ProgressBar->new({ count => 0,
-                                                  name => $name }); },
-        'V2 mode ( 1)' ),
-      1,                                                       'V2 mode ( 1)');
-  ok (evcheck(sub { $p->update($_) for 1..10 },'V2 mode ( 2)'),
-      1,                                                       'V2 mode ( 2)');
+  lives_ok { $p = Term::ProgressBar->new({ count => 0, name => $name }); } 'V2 mode ( 1)';
+  lives_ok { $p->update($_) for 1..10 } 'V2 mode ( 2)';
 };
 print $out;
   my @lines = grep $_ ne '', split /\r/, $err;
   print Dumper \@lines
     if $ENV{TEST_DEBUG};
-  ok $lines[-1], qr/^$name:/,                                  'V2 mode ( 3)';
-  ok $lines[-1], qr/\(nothing to do\)/,                        'V2 mode ( 4)';
+  like $lines[-1], qr/^$name:/,                                  'V2 mode ( 3)';
+  like $lines[-1], qr/\(nothing to do\)/,                        'V2 mode ( 4)';
 }
 
 # ----------------------------------------------------------------------------