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

diff --git a/t/20-bad.t b/t/20-bad.t
index 5c57ebe..35c8723 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -1,39 +1,66 @@
 #!perl -T
 
+package Dongs;
+
+sub new;
+
+package main;
+
 use strict;
 use warnings;
 
-use Test::More tests => 30 * 2 + 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;
-  {
-   use indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-   eval "die qq{ok\\n}; $_";
-  }
-  is($@, "ok\n", $_);
-  {
-   no indirect;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-   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|\$x|\$_)"/, $_);
+  s/\s*$//;
+
+  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+
+  eval "die qq{ok\\n}; use indirect; $_";
+  is($@, "ok\n", "use indirect: $_");
+
+  eval "die qq{the code compiled but it shouldn't have\n}; no indirect; $_";
+  like($@, expect('Hlagh'), "no indirect: $_");
+
+  s/Hlagh/Dongs/g;
+
+  eval "die qq{ok\\n}; use indirect; $_";
+  is($@, "ok\n", "use indirect, defined: $_");
+
+  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;
+
+  eval "die qq{ok\\n}; use indirect; $_";
+  is($@, "ok\n", "use indirect, spaces: $_");
+
+  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__
@@ -94,10 +121,60 @@ $obj = new $_      qr/foo/  ;
 ####
 $obj = new $_     qq(bar baz);
 ####
+meh $_;
+####
+meh $_ 1, 2;
+####
+meh $$;
+####
+meh $$ 1, 2;
+####
 meh $x;
 ####
+meh $x 1, 2;
+####
 meh $x, 1, 2;
 ####
+meh $y;
+####
+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;
+####
+package sploosh;
+our $sploosh;
+meh $sploosh;
+####
+package sploosh;
+meh $main::bloop;
+####
+package sploosh;
+meh $bloop;
+####
+package ma;
+meh $bloop;
+####
+package sploosh;
+our $sploosh;
+package main;
+meh $sploosh::sploosh;
+####
+new Hlagh->wut;
+####
+new Hlagh->wut();
+####
+new Hlagh->wut, "Wut";
+####
 $obj = HlaghHlagh Hlagh;
 ####
 $obj = HlaghHlagh Hlagh; # HlaghHlagh Hlagh