X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-bad.t;h=01f6a283943ae950aef2cbf377fccb4009c2b8bc;hb=aac0ea8cc9209c97ac63df35a99f4afc30388d2b;hp=226a2fccb258dd3fb8938324fa586804dd6a02cd;hpb=f09d654a5606b2176a224ea7f45cfdef3dc761e9;p=perl%2Fmodules%2Findirect.git

diff --git a/t/20-bad.t b/t/20-bad.t
index 226a2fc..01f6a28 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,14 +9,21 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 36 * 4 + 2;
+use Test::More tests => 46 * 6 + 2;
 
 my ($obj, $x);
+our ($y, $bloop);
+
+sub expect {
+ my ($pkg) = @_;
+ return qr/^warn:Indirect call of method "(?:new|meh|$pkg$pkg)" on object "(?:$pkg|newnew|\$(?:[xy_\$]|(?:sploosh::)?sploosh|(?:main::)?bloop))"/
+}
 
 {
  local $/ = "####\n";
  while (<DATA>) {
   chomp;
+  s/\s*$//;
   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
   {
    use indirect;
@@ -27,7 +34,7 @@ my ($obj, $x);
    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|\$x|\$_)"/, "no indirect: $_");
+  like($@, expect('Hlagh'), "no indirect: $_");
   s/Hlagh/Dongs/g;
   {
    use indirect;
@@ -38,7 +45,19 @@ my ($obj, $x);
    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|\$x|\$_)"/, "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: $_");
  }
 }
 
@@ -114,12 +133,41 @@ 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;
+####
+package sploosh;
+our $sploosh;
+meh $sploosh::sploosh;
+####
+package sploosh;
+our $sploosh;
+meh $sploosh;
+####
+package sploosh;
+meh $main::bloop;
+####
+package sploosh;
+meh $bloop;
+####
+package sploosh;
+our $sploosh;
+package main;
+meh $sploosh::sploosh;
+####
 new Hlagh->wut;
 ####
 new Hlagh->wut();