=head1 VERSION
-Version 0.01
+Version 0.02
=cut
-our $VERSION = '0.01';
+our $VERSION = '0.02';
=head1 SYNOPSIS
C<use_ok>, C<require_ok>, C<can_ok>, C<isa_ok>, C<new_ok>, C<subtest>, C<explain>, C<TODO> blocks and C<todo_skip> are not implemented.
-=item *
-
-L<Test::Leaner> depends on L<Scalar::Util>, while L<Test::More> does not.
-
=back
=cut
-use Exporter ();
-use Scalar::Util ();
+use Exporter ();
+
+my $main_process;
BEGIN {
+ $main_process = $$;
+
if ($] >= 5.008 and $INC{'threads.pm'}) {
my $use_ithreads = do {
require Config;
my ($plan, $test, $failed, $no_diag, $done_testing);
+our @EXPORT = qw<
+ plan
+ skip
+ done_testing
+ pass
+ fail
+ ok
+ is
+ isnt
+ like
+ unlike
+ cmp_ok
+ is_deeply
+ diag
+ note
+ BAIL_OUT
+>;
+
+=head1 ENVIRONMENT
+
+=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).
+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.
+
+=cut
+
+sub _handle_import_args {
+ my @imports;
+
+ my $i = 0;
+ while ($i <= $#_) {
+ my $item = $_[$i];
+ my $splice;
+ if (defined $item) {
+ if ($item eq 'import') {
+ push @imports, @{ $_[$i+1] };
+ $splice = 2;
+ } elsif ($item eq 'no_diag') {
+ lock $plan if THREADSAFE;
+ $no_diag = 1;
+ $splice = 1;
+ }
+ }
+ if ($splice) {
+ splice @_, $i, $splice;
+ } else {
+ ++$i;
+ }
+ }
+
+ return @imports;
+}
+
+if ($ENV{PERL_TEST_LEANER_USES_TEST_MORE}) {
+ require Test::More;
+
+ my $leaner_stash = \%Test::Leaner::;
+ my $more_stash = \%Test::More::;
+
+ my %valid_imports;
+
+ for (@EXPORT) {
+ my $replacement = exists $more_stash->{$_} ? *{$more_stash->{$_}}{CODE}
+ : undef;
+ if (defined $replacement) {
+ $valid_imports{$_} = 1;
+ } else {
+ $replacement = sub {
+ @_ = ("$_ is not implemented in this version of Test::More");
+ goto &croak;
+ };
+ }
+ no warnings 'redefine';
+ $leaner_stash->{$_} = $replacement;
+ }
+
+ my $import = sub {
+ shift;
+ my @imports = &_handle_import_args;
+ @imports = @EXPORT unless @imports;
+ my @test_more_imports;
+ for (@imports) {
+ if ($valid_imports{$_}) {
+ push @test_more_imports, $_;
+ } else {
+ my $pkg = caller;
+ no strict 'refs';
+ *{$pkg."::$_"} = $leaner_stash->{$_};
+ }
+ }
+ my $test_more_import = 'Test::More'->can('import');
+ @_ = (
+ 'Test::More',
+ @_,
+ import => \@test_more_imports,
+ );
+ {
+ lock $plan if THREADSAFE;
+ push @_, 'no_diag' if $no_diag;
+ }
+ goto $test_more_import;
+ };
+
+ no warnings 'redefine';
+ *import = $import;
+
+ return 1;
+}
+
sub NO_PLAN () { -1 }
sub SKIP_ALL () { -2 }
sub carp {
my $level = 1 + ($Test::Builder::Level || 0);
- my ($file, $line) = (caller $level)[1, 2];
+ my @caller;
+ do {
+ @caller = caller $level--;
+ } while (!@caller and $level >= 0);
+ my ($file, $line) = @caller[1, 2];
warn @_, " at $file line $line.\n";
}
sub croak {
my $level = 1 + ($Test::Builder::Level || 0);
- my ($file, $line) = (caller $level)[1, 2];
+ my @caller;
+ do {
+ @caller = caller $level--;
+ } while (!@caller and $level >= 0);
+ my ($file, $line) = @caller[1, 2];
die @_, " at $file line $line.\n";
}
return 1;
}
-our @EXPORT = qw<
- plan
- skip
- done_testing
- pass
- fail
- ok
- is
- isnt
- like
- unlike
- cmp_ok
- is_deeply
- diag
- note
- BAIL_OUT
->;
-
sub import {
my $class = shift;
- my @imports;
- my $i = 0;
- while ($i <= $#_) {
- my $item = $_[$i];
- my $splice;
- if (defined $item) {
- if ($item eq 'import') {
- push @imports, @{ $_[$i+1] };
- $splice = 2;
- } elsif ($item eq 'no_diag') {
- lock $plan if THREADSAFE;
- $no_diag = 1;
- $splice = 1;
- }
- }
- if ($splice) {
- splice @_, $i, $splice;
- } else {
- ++$i;
- }
- }
+ my @imports = &_handle_import_args;
if (@_) {
local $Test::Builder::Level = ($Test::Builder::Level || 0) + 1;
=cut
+BEGIN {
+ local $@;
+ if (eval { require Scalar::Util; 1 }) {
+ *_reftype = \&Scalar::Util::reftype;
+ } else {
+ # Stolen from Scalar::Util::PP
+ require B;
+ my %tmap = qw<
+ B::NULL SCALAR
+
+ B::HV HASH
+ B::AV ARRAY
+ B::CV CODE
+ B::IO IO
+ B::GV GLOB
+ B::REGEXP REGEXP
+ >;
+ *_reftype = sub ($) {
+ my $r = shift;
+
+ return undef unless length ref $r;
+
+ my $t = ref B::svref_2object($r);
+
+ return exists $tmap{$t} ? $tmap{$t}
+ : length ref $$r ? 'REF'
+ : 'SCALAR'
+ }
+ }
+}
+
sub _deep_ref_check {
my ($x, $y, $ry) = @_;
next if not(ref $ex xor ref $ey) and $ex eq $ey;
- $ry = Scalar::Util::reftype($ey);
- return 0 if Scalar::Util::reftype($ex) ne $ry;
+ $ry = _reftype($ey);
+ return 0 if _reftype($ex) ne $ry;
return 0 unless $ry and _deep_ref_check($ex, $ey, $ry);
}
next if not(ref $ex xor ref $ey) and $ex eq $ey;
- $ry = Scalar::Util::reftype($ey);
- return 0 if Scalar::Util::reftype($ex) ne $ry;
+ $ry = _reftype($ey);
+ return 0 if _reftype($ex) ne $ry;
return 0 unless $ry and _deep_ref_check($ex, $ey, $ry);
}
# Test::More::is_deeply happily breaks encapsulation if the objects aren't
# overloaded.
- my $ry = Scalar::Util::reftype($y);
- return 0 if Scalar::Util::reftype($x) ne $ry;
+ my $ry = _reftype($y);
+ return 0 if _reftype($x) ne $ry;
# Shortcut if $x and $y are both not references and failed the previous
# $x eq $y test.
}
END {
- unless ($?) {
+ if ($main_process == $$ and not $?) {
lock $plan if THREADSAFE;
if (defined $plan) {
L<perl> 5.6.
-L<Exporter>, L<Scalar::Util>, L<Test::More>.
+L<Exporter>, L<Test::More>.
=head1 AUTHOR