X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-scope.t;h=f3586890c876e2583128df3b1f2682695d22cd48;hb=993994ae9c31e173043cec3aff1a924bb2694886;hp=f2a785f38b2d1830c6c5eca061100ade95e919c5;hpb=7ded1e91a0a0ddc3e709cda9573fe0e53a32e092;p=perl%2Fmodules%2Findirect.git

diff --git a/t/30-scope.t b/t/30-scope.t
index f2a785f..f358689 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -4,11 +4,16 @@ use strict;
 use warnings;
 
 my $tests;
-BEGIN { $tests = 8 }
+BEGIN { $tests = 10 }
 
-use Test::More tests => $tests + 1;
+use Test::More tests => 1 + $tests + 1 + 2;
 
-my %wrong = map { $_ => 1 } 2, 3, 5, 7;
+my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10;
+
+sub expect {
+ my ($pkg) = @_;
+ return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"/;
+}
 
 {
  my $code = do { local $/; <DATA> };
@@ -16,6 +21,7 @@ my %wrong = map { $_ => 1 } 2, 3, 5, 7;
  {
   local $SIG{__WARN__} = sub { push @warns, join '', 'warn:', @_ };
   eval "die qq{ok\\n}; $code";
+  is($@, "ok\n", 'DATA compiled fine');
  }
  my $left = 0;
  my %res = map {
@@ -28,7 +34,7 @@ my %wrong = map { $_ => 1 } 2, 3, 5, 7;
  for (1 .. $tests) {
   my $w = $res{$_};
   if ($wrong{$_}) {
-   like($w, qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"P$_"/, "$_ should warn");
+   like($w, expect("P$_"), "$_ should warn");
   } else {
    is($w, undef, "$_ shouldn't warn");
   }
@@ -36,6 +42,30 @@ my %wrong = map { $_ => 1 } 2, 3, 5, 7;
  is($left, 0, 'nothing left');
 }
 
+{
+ my $w = '';
+ local $SIG{__WARN__} = sub {
+  $w = 'more than 2 warnings' if $w;
+  $w = join '', 'warn:', @_
+ };
+ {
+  eval 'no indirect; my $x = new Foo';
+  like($w, expect('Foo'), "eval 'no indirect; my \$x = new Foo'");
+ }
+ $w = '';
+ {
+  {
+   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'");
+  }
+ }
+}
+
 __DATA__
 my $a = new P1;
 
@@ -61,3 +91,10 @@ my $g = new P7;
 use indirect;
 
 my $h = new P8;
+
+{
+ no indirect;
+ eval { my $i = new P9 };
+}
+
+eval { no indirect; my $j = new P10 };