X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F30-scope.t;h=8eb7eccb975042c5a45a9e45f339ddaca0bc2015;hp=414c9c759bcbb4d304104e7522d3d7ece4bc9a47;hb=3b0a87b6115bb15525313ea0dc3def689d2fb2e8;hpb=da26cc8e6a433e138ea14c50a48534358db57471

diff --git a/t/30-scope.t b/t/30-scope.t
index 414c9c7..8eb7ecc 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -4,33 +4,35 @@ 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 + 2 + 2;
 
-my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10;
+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"/;
+ return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"\s+at\s+\(eval\s+\d+\)\s+line\s+\d+/;
 }
 
 {
  my $code = do { local $/; <DATA> };
- my @warns;
+ my (%res, $num, @left);
  {
-  local $SIG{__WARN__} = sub { push @warns, join '', 'warn:', @_ };
+  local $SIG{__WARN__} = sub {
+   ++$num;
+   my $w = join '', 'warn:', @_;
+   if ($w =~ /"P(\d+)"/ and not exists $res{$1}) {
+    $res{$1} = $w;
+   } else {
+    push @left, "[$num] $w";
+   }
+  };
   eval "die qq{ok\\n}; $code";
   is($@, "ok\n", 'DATA compiled fine');
  }
- my $left = 0;
- my %res = map {
-  if (/"P(\d+)"/) {
-   $1 => $_
-  } else {
-   ++$left; ()
-  }
- } @warns;
  for (1 .. $tests) {
   my $w = $res{$_};
   if ($wrong{$_}) {
@@ -39,11 +41,12 @@ sub expect {
    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;
+ my $w = '';
  local $SIG{__WARN__} = sub {
   $w = 'more than 2 warnings' if $w;
   $w = join '', 'warn:', @_
@@ -58,7 +61,7 @@ sub expect {
    no indirect;
    eval 'my $x = new Bar';
   }
-  if ($] < 5.010) {
+  if ($] < 5.009005) {
    is($w, '', "eval 'no indirect; my \$x = new Bar'");
   } else {
    like($w, expect('Bar'), "no indirect; eval 'my \$x = new Bar'");
@@ -66,6 +69,17 @@ sub expect {
  }
 }
 
+{
+ local $TODO = 'Need a workaround for this' if $] < 5.010001;
+ my @w;
+ {
+  local $SIG{__WARN__} = sub { push @w, join '', @_ };
+  eval 'no indirect; use indirect::TestRequired';
+ }
+ is         $@, '',  'require test didn\'t croak';
+ is_deeply \@w, [ ], 'pragma didn\'t propagate into the required file';
+}
+
 __DATA__
 my $a = new P1;
 
@@ -98,3 +112,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 };
+}