Rename some test files

[perl/modules/indirect.git] / t / 30-scope.t

diff --git a/t/30-scope.t b/t/30-scope.t
index f3586890c876e2583128df3b1f2682695d22cd48..1e1dcf3d8fe7c2123521fc89cb70e6c3e3467da4 100644 (file)
--- a/t/30-scope.t
+++ b/t/30-scope.t
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 
 my $tests;
-BEGIN { $tests = 10 }
+BEGIN { $tests = 18 }
 
 use Test::More tests => 1 + $tests + 1 + 2;
 
-my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10;
+my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10, 14, 15, 17, 18;
 
 sub expect {
  my ($pkg) = @_;
@@ -17,20 +17,20 @@ sub expect {
 
 {
  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,7 +39,8 @@ 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;
 }
 
 {
@@ -98,3 +99,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 };
+}