X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-scope.t;h=19e29df2e520c30e3df66c29d5c1df2ca74f4238;hb=d8064d5f5037d23c51e6e62386f32e65cef50d33;hp=2eceddb401b03cb92981e3763ee0c5d3401515b5;hpb=93e46f6f746b5a546672c36dc0608aa035abee37;p=perl%2Fmodules%2Findirect.git

diff --git a/t/30-scope.t b/t/30-scope.t
index 2eceddb..19e29df 100644
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -1,58 +1,93 @@
-#!perl
+#!perl -T
 
 use strict;
 use warnings;
 
-my $total = 8;
+my $tests;
+BEGIN { $tests = 8 }
 
-use Test::More;
+use Test::More tests => 1 + $tests + 1 + 2;
 
-use IPC::Cmd qw/run/;
+my %wrong = map { $_ => 1 } 2, 3, 5, 7;
 
-(my $success, my $err_code, undef, undef, my $stderr)
- = run command => [
-          $^X,
-          map('-I' . $_, @INC),
-          $ENV{PERL5OPT} || '',
-          '-c',
-          't/data/mixed.d'
-   ];
-
-plan skip_all => "Couldn't capture buffers" if $success and not defined $stderr;
-plan tests => $total + 1;
+sub expect {
+ my ($pkg) = @_;
+ return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"/;
+}
 
-$stderr = join '', @$stderr;
-unless ($success) {
- diag $stderr;
- diag "Failed to execute data file (error $err_code)";
- fail "Couldn't run test $_" for 1 .. $total + 1;
- exit $total + 1;
+{
+ my $code = do { local $/; <DATA> };
+ my @warns;
+ {
+  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 {
+  if (/"P(\d+)"/) {
+   $1 => $_
+  } else {
+   ++$left; ()
+  }
+ } @warns;
+ for (1 .. $tests) {
+  my $w = $res{$_};
+  if ($wrong{$_}) {
+   like($w, expect("P$_"), "$_ should warn");
+  } else {
+   is($w, undef, "$_ shouldn't warn");
+  }
+ }
+ is($left, 0, 'nothing left');
 }
 
-my %fail = map { $_ => 1 } 2, 3, 5, 7;
-my %failed;
-my $extra_fail = 0;
-
-while ($stderr =~ /^Indirect\s+call\s+of\s+method\s+"([^"]+)"\s+on\s+object\s+"([^"]+)"/mg) {
- my ($m, $o) = ($1, $2);
- my $id;
- if ($o =~ /^P(\d+)$/) {
-  $id = $1;
- } else {
-  diag "$m $o";
-  ++$extra_fail;
+{
+ 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'");
  }
- if ($id) {
-  if (exists $fail{$id}) {
-   pass("test $id failed as expected");
-   delete $fail{$id};
-   $failed{$id} = 1;
+ $w = '';
+ {
+  {
+   no indirect;
+   eval 'my $x = new Bar';
+  }
+  if ($] < 5.010) {
+   is($w, '', "eval 'no indirect; my \$x = new Bar'");
   } else {
-   fail("test $id shouldn't have failed");
+   like($w, expect('Bar'), "no indirect; eval 'my \$x = new Bar'");
   }
  }
 }
 
-pass("test $_ hasn't failed") for grep { !$failed{$_} } 1 .. $total;
-fail("test $_ should have failed") for sort { $a <=> $b } keys %fail;
-is($extra_fail, 0, 'no extra fails');
+__DATA__
+my $a = new P1;
+
+{
+ no indirect;
+ my $b = new P2;
+ {
+  my $c = new P3;
+ }
+ {
+  use indirect;
+  my $d = new P4;
+ }
+ my $e = new P5;
+}
+
+my $f = new P6;
+
+no indirect;
+
+my $g = new P7;
+
+use indirect;
+
+my $h = new P8;