X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F30-scope.t;h=dc2870ca5c9d2fdf8bd981ddd14248ca6f1716f8;hp=20eeebbde73ff50d4c13a2ab519b280af4d399c6;hb=84cf20f38df18db8a29e9d4676b2ffa97451c83a;hpb=6c5e0c9599d21127c3b91da9f46f3eedcf3f85d2 diff --git a/t/30-scope.t b/t/30-scope.t index 20eeebb..dc2870c 100644 --- a/t/30-scope.t +++ b/t/30-scope.t @@ -1,69 +1,182 @@ -#!perl -T +#!perl use strict; use warnings; my $tests; -BEGIN { $tests = 10 } +BEGIN { $tests = 18 } -use Test::More tests => 1 + $tests + 1 + 2; +use Test::More tests => (1 + $tests + 1) + 3 + 3 + 3 + 5 + 4 + 5; -my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10; +BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} } + +use lib 't/lib'; + +my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10, 14, 15, 17, 18; sub expect { - my ($pkg) = @_; - return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"/; + my ($pkg, $file) = @_; + $file = $file ? quotemeta $file : '\(eval \d+\)'; + qr/^warn:Indirect call of method "new" on object "$pkg" at $file line \d+/; } { my $code = do { local $/; }; - my (%res, @left); + my (%res, $num, @left); + { local $SIG{__WARN__} = sub { + ++$num; my $w = join '', 'warn:', @_; if ($w =~ /"P(\d+)"/ and not exists $res{$1}) { $res{$1} = $w; } else { - push @left, $w; + push @left, "[$num] $w"; } }; - eval "die qq{ok\\n}; $code"; - is($@, "ok\n", 'DATA compiled fine'); + eval "return; $code"; } + is $@, '', 'DATA compiled fine'; + for (1 .. $tests) { my $w = $res{$_}; if ($wrong{$_}) { - like($w, expect("P$_"), "$_ should warn"); + like $w, expect("P$_"), "$_ should warn"; } else { - is($w, undef, "$_ shouldn't warn"); + is $w, undef, "$_ shouldn't warn"; } } - is(@left, 0, 'nothing left'); + + is @left, 0, 'nothing left'; diag "Extraneous warnings:\n", @left if @left; } { - my $w = ''; - local $SIG{__WARN__} = sub { - $w = 'more than 2 warnings' if $w; - $w = join '', 'warn:', @_ - }; + my @w; { - eval 'no indirect; my $x = new Foo'; - like($w, expect('Foo'), "eval 'no indirect; my \$x = new Foo'"); + local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ }; + eval 'return; no indirect; my $x = new Foo'; } - $w = ''; + is $@, '', "eval 'no indirect; my \$x = new Foo'"; + is @w, 1, 'got one warning'; + diag join "\n", 'All warnings:', @w if @w > 1; + like $w[0], expect('Foo'), 'correct warning'; +} + +{ + my @w; { + local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ }; { no indirect; - eval 'my $x = new Bar'; - } - if ($] < 5.010) { - is($w, '', "eval 'no indirect; my \$x = new Bar'"); - } else { - like($w, expect('Bar'), "no indirect; eval 'my \$x = new Bar'"); + eval 'return; my $x = new Bar'; } } + is $@, '', "no indirect; eval 'my \$x = new Bar'"; + if ($] < 5.009005) { + is @w, 0, 'no warnings caught'; + pass 'placeholder'; + } else { + is @w, 1, 'got one warning'; + diag join "\n", 'All warnings:', @w if @w > 1; + like $w[0], expect('Bar'), 'correct warning'; + } +} + +{ + my @w; + { + local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ }; + eval "return; no indirect; use indirect::TestRequired1; my \$x = new Foo;"; + } + is $@, '', 'first require test doesn\'t croak prematurely'; + is @w, 1, 'first require threw only one warning'; + diag join "\n", 'All warnings:', @w if @w > 1; + like $w[0], expect('Foo'), 'first require test catch errors in current scope'; +} + +{ + my @w; + { + local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ }; + eval "return; no indirect; use indirect::TestRequired2; my \$x = new Bar;"; + } + is $@, '', 'second require test doesn\'t croak prematurely'; + @w = grep !/^warn:Attempt\s+to\s+free\s+unreferenced/, @w if $] <= 5.008003; + my $w = shift @w; + like $w, expect('Baz', 't/lib/indirect/TestRequired2.pm'), + 'second require test caught error for Baz'; + SKIP: { + skip 'The pragma doesn\'t propagte into eval STRING before perl 5.10' => 1 + if $] < 5.009005; + $w = shift @w; + like $w, expect('Blech'), 'second require test caught error for Blech'; + } + $w = shift @w; + like $w, expect('Bar'), 'second require test caught error for Bar'; + is_deeply \@w, [ ], 'second require test doesn\'t have more errors'; +} + +{ + local @main::new; + my (@err, @w); + sub cb3 { push @err, $_[0] }; + local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ }; + eval <<' TESTREQUIRED3'; + { + package indirect::TestRequired3Z; + sub new { push @main::new, __PACKAGE__ } + no indirect hook => \&main::cb3; + use indirect::TestRequired3X; + use indirect::TestRequired3Y; + new indirect::TestRequired3Z; + } + TESTREQUIRED3 + @w = grep !/^warn:Attempt\s+to\s+free\s+unreferenced/, @w if $] <= 5.008003; + is $@, '', + "pragma leak when reusing callback test doesn't croak prematurely"; + is_deeply \@w, [ ], + "pragma leak when reusing callback test doesn't warn"; + is_deeply \@err, [ map "indirect::TestRequired3$_", qw/X Z/ ], + "pragma leak when reusing callback test caught the right errors"; + is_deeply \@main::new, [ map "indirect::TestRequired3$_", qw/X Y Z/ ], + "pragma leak when reusing callback test ran the three constructors"; +} + +{ + eval <<' SNIP'; + return; + no indirect ':fatal'; + use indirect::Test1::il1 (); + use indirect::Test1::il2 (); + SNIP + is $@, '', 'RT #47902'; +} + +# This test may not fail for the old version when ran in taint mode +{ + my $err = eval <<' SNIP'; + use indirect::TestRequired4::a0; + indirect::TestRequired4::a0::error(); + SNIP + like $err, qr/^Can't locate object method "new" via package "X"/, 'RT #50570'; +} + +# This test must be in the topmost scope +BEGIN { eval 'use indirect::TestRequired5::a0' } +my $err = indirect::TestRequired5::a0::error(); +like $err, qr/^Can't locate object method "new" via package "X"/, + 'identifying requires by their eval context pointer is not enough'; + +{ + my @w; + no indirect hook => sub { push @w, indirect::msg(@_) }; + use indirect::TestRequired6; + indirect::TestRequired6::bar(); + is_deeply \@w, [ ], 'indirect syntax in sub'; + @w = (); + indirect::TestRequired6::baz(); + is_deeply \@w, [ ], 'indirect syntax in eval in sub'; } __DATA__ @@ -98,3 +211,23 @@ my $h = new P8; } eval { no indirect; my $j = new P10 }; + +{ + use indirect; + new P11 do { use indirect; new P12 }; +} + +{ + use indirect; + new P13 do { no indirect; new P14 }; +} + +{ + no indirect; + new P15 do { use indirect; new P16 }; +} + +{ + no indirect; + new P17 do { no indirect; new P18 }; +}