X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-bad.t;h=0321c20749f411c7cbc6e18d2f8d9a8a444aa3d9;hb=aae3f9854e79cc0d989ba60f129f8a13ed1c11fc;hp=57df08fb0d5aad6acec2ed8ff9a103ab43948a1f;hpb=33de2d51651577aa4d7a8a1ff6a2fad07b1711c7;p=perl%2Fmodules%2Findirect.git

diff --git a/t/20-bad.t b/t/20-bad.t
index 57df08f..0321c20 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,15 +9,24 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 44 * 4 + 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|\$(?:[xyz_\$]|(?:sploosh::)?sploosh|(?:main::)?bloop))"/
+}
 
 {
  local $/ = "####\n";
  while (<DATA>) {
   chomp;
+  s/\s*$//;
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
   {
    use indirect;
@@ -28,7 +37,7 @@ our ($y, $bloop);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|HlaghHlagh)"\s+on\s+object\s+"(?:Hlagh|newnew|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect: $_");
+  like($@, expect('Hlagh'), "no indirect: $_");
   s/Hlagh/Dongs/g;
   {
    use indirect;
@@ -39,7 +48,19 @@ our ($y, $bloop);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"(?:new|meh|DongsDongs)"\s+on\s+object\s+"(?:Dongs|newnew|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect, defined: $_");
+  like($@, expect('Dongs'), "no indirect, defined: $_");
+  s/\$/\$ \n\t /g;
+  s/Dongs/Hlagh/g;
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect, spaces: $_");
+  {
+   no indirect;
+   eval "die qq{the code compiled but it shouldn't have\n}; $_";
+  }
+  like($@, expect('Hlagh'), "no indirect, spaces: $_");
  }
 }
 
@@ -47,10 +68,9 @@ 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}; \$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__
@@ -115,6 +135,10 @@ meh $_;
 ####
 meh $_ 1, 2;
 ####
+meh $$;
+####
+meh $$ 1, 2;
+####
 meh $x;
 ####
 meh $x 1, 2;
@@ -127,6 +151,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;
@@ -141,6 +171,9 @@ meh $main::bloop;
 package sploosh;
 meh $bloop;
 ####
+package ma;
+meh $bloop;
+####
 package sploosh;
 our $sploosh;
 package main;