X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F20-bad.t;h=8bd5602258260e7d5b2230be65bbcd3b56941eac;hb=a26912556e065ea799bd946af5274c089c817838;hp=0a61cd1917454c16db0c84054042650389d4a6c3;hpb=f4e7787d7c015980abba9a8d76f0293f24e0ab94;p=perl%2Fmodules%2Findirect.git

diff --git a/t/20-bad.t b/t/20-bad.t
index 0a61cd1..8bd5602 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,9 +9,15 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 33 * 4 + 2;
+use Test::More tests => 44 * 4 + 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";
@@ -27,7 +33,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 +44,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|DongsDongs)"\s+on\s+object\s+"(?:Dongs|newnew|\$x|\$_)"/, "no indirect, defined: $_");
+  like($@, expect('Dongs'), "no indirect, defined: $_");
  }
 }
 
@@ -110,10 +116,41 @@ $obj = new $_      qr/foo/  ;
 ####
 $obj = new $_     qq(bar baz);
 ####
+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();