From: Vincent Pit Date: Mon, 18 Jul 2011 14:04:10 +0000 (+0200) Subject: Update bundled Test::Leaner to 0.03 X-Git-Tag: v0.15~6 X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=2e88c3aab11a9282e757ef97d7ff3a2da749c4d9;p=perl%2Fmodules%2FScope-Upper.git Update bundled Test::Leaner to 0.03 --- diff --git a/t/lib/Test/Leaner.pm b/t/lib/Test/Leaner.pm index 3365006..c67eaed 100644 --- a/t/lib/Test/Leaner.pm +++ b/t/lib/Test/Leaner.pm @@ -10,11 +10,11 @@ Test::Leaner - A slimmer Test::More for when you favor performance over complete =head1 VERSION -Version 0.02 +Version 0.03 =cut -our $VERSION = '0.02'; +our $VERSION = '0.03'; =head1 SYNOPSIS @@ -37,16 +37,20 @@ Its functions behave the same as their L counterparts, except for th =item * Stringification isn't forced on the test operands. -However, L honors C<'bool'> overloading, L and L honor C<'eq'> overloading (and just that one) and L honors whichever overloading category corresponds to the specified operator. +However, L honors C<'bool'> overloading, L and L honor C<'eq'> overloading (and just that one), L honors C<'ne'> overloading, and L honors whichever overloading category corresponds to the specified operator. =item * -L, L, L, L, L, L, L and L are all guaranteed to return the truth value of the test. +L, L, L, L, L, L, L, L and L are all guaranteed to return the truth value of the test. + +=item * + +C (the sub C in package C) is not aliased to L. =item * L and L don't special case regular expressions that are passed as C<'/.../'> strings. -A string regexp argument is always treated as a the source of the regexp, making C and C equivalent to each other and to C (and likewise for C). +A string regexp argument is always treated as the source of the regexp, making C and C equivalent to each other and to C (and likewise for C). =item * @@ -61,6 +65,7 @@ If the two first arguments present parallel memory cycles, the test may result i =item * The tests don't output any kind of default diagnostic in case of failure ; the rationale being that if you have a large number of tests and a lot of them are failing, then you don't want to be flooded by diagnostics. +Moreover, this allows a much faster variant of L. =item * @@ -120,7 +125,7 @@ our @EXPORT = qw< =head2 C If this environment variable is set, L will replace its functions by those from L. -Moreover, the symbols that are imported you C will be those from L, but you can still only import the symbols originally defined in L (hence the functions from L that are not implemented in L will not be imported). +Moreover, the symbols that are imported when you C will be those from L, but you can still only import the symbols originally defined in L (hence the functions from L that are not implemented in L will not be imported). If your version of L is too old and doesn't have some symbols (like L or L), they will be replaced in L by croaking stubs. This may be useful if your L-based test script fails and you want extra diagnostics. @@ -160,14 +165,13 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) { my $leaner_stash = \%Test::Leaner::; my $more_stash = \%Test::More::; - my %valid_imports; + my %stubbed; for (@EXPORT) { my $replacement = exists $more_stash->{$_} ? *{$more_stash->{$_}}{CODE} : undef; - if (defined $replacement) { - $valid_imports{$_} = 1; - } else { + unless (defined $replacement) { + $stubbed{$_}++; $replacement = sub { @_ = ("$_ is not implemented in this version of Test::More"); goto &croak; @@ -178,20 +182,33 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) { } my $import = sub { - shift; + my $class = shift; + my @imports = &_handle_import_args; - @imports = @EXPORT unless @imports; + if (@imports == grep /^!/, @imports) { + # All imports are negated, or @imports is empty + my %negated; + /^!(.*)/ and ++$negated{$1} for @imports; + push @imports, grep !$negated{$_}, @EXPORT; + } + my @test_more_imports; for (@imports) { - if ($valid_imports{$_}) { - push @test_more_imports, $_; - } else { + if ($stubbed{$_}) { my $pkg = caller; no strict 'refs'; *{$pkg."::$_"} = $leaner_stash->{$_}; + } elsif (/^!/ or !exists $more_stash->{$_} or exists $leaner_stash->{$_}) { + push @test_more_imports, $_; + } else { + # Croak for symbols in Test::More but not in Test::Leaner + Exporter::import($class, $_); } } + my $test_more_import = 'Test::More'->can('import'); + return unless $test_more_import; + @_ = ( 'Test::More', @_, @@ -201,6 +218,7 @@ if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) { lock $plan if THREADSAFE; push @_, 'no_diag' if $no_diag; } + goto $test_more_import; }; @@ -402,10 +420,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; @@ -864,7 +882,7 @@ You can find documentation for this module with the perldoc command. =head1 COPYRIGHT & LICENSE -Copyright 2010 Vincent Pit, all rights reserved. +Copyright 2010,2011 Vincent Pit, all rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.