X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-bad.t;h=35c8723ff752ebb26573ee24ca5e2ab323a2ddb4;hb=3b879bdf6ec7035d353f6c6fdeff405633dbf493;hp=a545108a6583d1dbd67747c038b34b601c2c2ad3;hpb=c8c4f6a0ef3e302ef052516259c03de71e2a26b1;p=perl%2Fmodules%2Findirect.git

diff --git a/t/20-bad.t b/t/20-bad.t
index a545108..35c8723 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,14 +9,17 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 47 * 6 + 2;
+use Test::More tests => 50 * 6 + 2;
+
+use feature 'state';
 
 my ($obj, $x);
 our ($y, $bloop);
+state $z;
 
 sub expect {
  my ($pkg) = @_;
- return qr/^warn:Indirect call of method "(?:new|meh|$pkg$pkg)" on object "(?:$pkg|newnew|\$(?:[xy_\$]|(?:sploosh::)?sploosh|(?:main::)?bloop))"/
+ return qr/^warn:Indirect call of method "(?:new|meh|$pkg$pkg)" on object "(?:$pkg|newnew|\$(?:[xyz_\$]|(?:sploosh::)?sploosh|(?:main::)?bloop))"/
 }
 
 {
@@ -24,51 +27,40 @@ sub expect {
  while (<DATA>) {
   chomp;
   s/\s*$//;
+
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Hlagh'), "no indirect: $_");
+
   s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, defined: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Dongs'), "no indirect, defined: $_");
+
   s/\$/\$ \n\t /g;
   s/Dongs/Hlagh/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
+
+  eval "die qq{ok\\n}; use indirect; $_";
   is($@, "ok\n", "use indirect, spaces: $_");
-  {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
-  }
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
   like($@, expect('Hlagh'), "no indirect, spaces: $_");
  }
 }
 
 eval {
- no indirect 'hlagh';
  my $warn;
  local $SIG{__WARN__} = sub { $warn = join ' ', @_ };
- eval "die qq{the code compiled but it shouldn't have\n}; \$obj = new Hlagh1;";
+ eval "die qq{ok\n}; no indirect 'hlagh'; \$obj = new Hlagh1;";
+ is($@, "ok\n", 'no indirect "hlagh" didn\'t croak');
  like($warn, qr/^Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"Hlagh1"/, 'no indirect "hlagh" enables the pragma');
- eval "die qq{the code compiled but it shouldn't have\n}; \$obj = new Hlagh2;";
- like($warn, qr/^Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"Hlagh2"/, 'no indirect "hlagh" doesn\'t croak');
 }
 
 __DATA__
@@ -149,6 +141,12 @@ meh $y 1, 2;
 ####
 meh $y, 1, 2;
 ####
+meh $z;
+####
+meh $z 1, 2;
+####
+meh $z, 1, 2;
+####
 package sploosh;
 our $sploosh;
 meh $sploosh::sploosh;