Directly test the truth of $ok in ok()

[perl/modules/Test-Leaner.git] / lib / Test / Leaner.pm

diff --git a/lib/Test/Leaner.pm b/lib/Test/Leaner.pm
index f1ee6ee4ac04d85d009628e8a86aa141d81bc67f..b07fbcac25b8e29e9418b09f32bbcaaa3c465a6c 100644 (file)
--- a/lib/Test/Leaner.pm
+++ b/lib/Test/Leaner.pm
@@ -37,7 +37,7 @@ Its functions behave the same as their L<Test::More> counterparts, except for th
 =item *
 
 Stringification isn't forced on the test operands.
-However, L</ok> honors C<'bool'> overloading, L</is> and L</is_deeply> honor C<'eq'> overloading (and just that one) and L</cmp_ok> honors whichever overloading category corresponds to the specified operator.
+However, L</ok> honors C<'bool'> overloading, L</is> and L</is_deeply> honor C<'eq'> overloading (and just that one), L</isnt> honors C<'ne'> overloading, and L</cmp_ok> honors whichever overloading category corresponds to the specified operator.
 
 =item *
 
@@ -121,7 +121,7 @@ our @EXPORT = qw<
 =head2 C<PERL_TEST_LEANER_USES_TEST_MORE>
 
 If this environment variable is set, L<Test::Leaner> will replace its functions by those from L<Test::More>.
-Moreover, the symbols that are imported you C<use Test::Leaner> will be those from L<Test::More>, but you can still only import the symbols originally defined in L<Test::Leaner> (hence the functions from L<Test::More> that are not implemented in L<Test::Leaner> will not be imported).
+Moreover, the symbols that are imported when you C<use Test::Leaner> will be those from L<Test::More>, but you can still only import the symbols originally defined in L<Test::Leaner> (hence the functions from L<Test::More> that are not implemented in L<Test::Leaner> will not be imported).
 If your version of L<Test::More> is too old and doesn't have some symbols (like L</note> or L</done_testing>), they will be replaced in L<Test::Leaner> by croaking stubs.
 
 This may be useful if your L<Test::Leaner>-based test script fails and you want extra diagnostics.
@@ -180,6 +180,7 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) {
 
  my $import = sub {
   shift;
+
   my @imports = &_handle_import_args;
   @imports = @EXPORT unless @imports;
   my @test_more_imports;
@@ -192,7 +193,10 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) {
     *{$pkg."::$_"} = $leaner_stash->{$_};
    }
   }
+
   my $test_more_import = 'Test::More'->can('import');
+  return unless $test_more_import;
+
   @_ = (
    'Test::More',
    @_,
@@ -202,6 +206,7 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) {
    lock $plan if THREADSAFE;
    push @_, 'no_diag' if $no_diag;
   }
+
   goto $test_more_import;
  };
 
@@ -403,10 +408,10 @@ sub ok ($;$) {
  ++$test;
 
  my $test_str = "ok $test";
- unless ($ok) {
+ $ok or do {
   $test_str   = "not $test_str";
   ++$failed;
- }
+ };
  if (defined $desc) {
   _sanitize_comment($desc);
   $test_str .= " - $desc" if length $desc;