X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F30-scope.t;h=a62e55e1c52ee83fda4a2eecea1e752b3e9c52ec;hp=14b987cb17de043947003fce4d9a0d9dc85374cb;hb=76861cbb848c770203b09f413c9c65ca58c808c8;hpb=efb7ebf910d324ec6f2dcd1fd7e6650b23a5dac7

diff --git a/t/30-scope.t b/t/30-scope.t
index 14b987c..a62e55e 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -1,4 +1,4 @@
-#!perl -T
+#!perl
 
 use strict;
 use warnings;
@@ -6,16 +6,20 @@ use warnings;
 my $tests;
 BEGIN { $tests = 18 }
 
-use Test::More tests => (1 + $tests + 1) + 3 + 3 + 3 + 5 + 1;
+use Test::More tests => (1 + $tests + 1) + 2 + 3 + 3 + 3 + 5 + 4 + 5 + 4;
+
+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, $file) = @_;
- $file = $file ? quotemeta $file : '\(eval \d+\)';
- qr/^warn:Indirect call of method "new" on object "$pkg" at $file line \d+/;
+ my ($obj, $file, $prefix) = @_;
+ $obj    = quotemeta $obj;
+ $file   = $file           ? quotemeta $file   : '\(eval \d+\)';
+ $prefix = defined $prefix ? quotemeta $prefix : 'warn:';
+ qr/^${prefix}Indirect call of method "new" on object "$obj" at $file line \d+/;
 }
 
 {
@@ -71,7 +75,7 @@ sub expect {
   }
  }
  is $@, '', "no indirect; eval 'my \$x = new Bar'";
- if ($] < 5.009005) {
+ if ("$]" < 5.009_005) {
   is   @w,   0,              'no warnings caught';
   pass 'placeholder';
  } else {
@@ -81,6 +85,20 @@ sub expect {
  }
 }
 
+SKIP: {
+ skip 'The pragma doesn\'t propagte into eval STRING before perl 5.10' => 2
+                                                            if "$]" < 5.009_005;
+ my @w;
+ my $test = sub { eval 'return; new XYZ' };
+ {
+  local $SIG{__WARN__} = sub { push @w, join '', 'warn:', @_ };
+  eval 'return; no indirect; BEGIN { $test->() }';
+ }
+ is   $@,    '',            'eval test doesn\'t croak prematurely';
+ is   @w,    0,             'eval did not throw a warning';
+ diag join "\n", 'All warnings:', @w if @w;
+}
+
 {
  my @w;
  {
@@ -100,13 +118,13 @@ sub expect {
   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;
+ @w = grep !/^warn:Attempt\s+to\s+free\s+unreferenced/, @w if "$]" <= 5.008_003;
  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;
+                                                            if "$]" < 5.009_005;
   $w = shift @w;
   like $w, expect('Blech'), 'second require test caught error for Blech';
  }
@@ -115,6 +133,32 @@ sub expect {
  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.008_003;
+ 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;
@@ -125,6 +169,57 @@ sub expect {
  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';
+}
+
+{
+ local $@;
+ eval { require indirect::Test2 };
+ is $@, '', 'direct call in string is not fooled by newlines';
+}
+
+{
+ local $@;
+ eval { require indirect::Test3 };
+ like $@, expect('$x', 't/lib/indirect/Test3.pm', ''),
+          'indirect call in string is not fooled by newlines';
+}
+
+{
+ local $@;
+ eval { require indirect::Test4 };
+ is $@, '', 'direct call in string is not fooled by more newlines';
+}
+
+{
+ local $@;
+ eval { require indirect::Test5 };
+ is $@, '', 'direct call in sort in string is not fooled by newlines';
+}
+
 __DATA__
 my $a = new P1;