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

diff --git a/t/20-bad.t b/t/20-bad.t
index 226a2fc..c480d6c 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -9,50 +9,69 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 36 * 4 + 2;
+use Test::More tests => 50 * 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|\$(?:[xyz_\$]|(?:sploosh::)?sploosh|(?:main::)?bloop))"/
+}
 
 {
- local $/ = "####\n";
+ local $/ = "####";
  while (<DATA>) {
   chomp;
-  local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
-  is($@, "ok\n", "use indirect: $_");
-  {
-   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: $_");
-  s/Hlagh/Dongs/g;
-  {
-   use indirect;
-   eval "die qq{ok\\n}; $_";
-  }
-  is($@, "ok\n", "use indirect, defined: $_");
+  s/\s*$//;
+  s/(.*?)$//m;
+  my ($skip, $prefix) = split /#+/, $1;
+  $skip   = 0  unless defined $skip;
+  $prefix = '' unless defined $prefix;
+  s/\s*//;
+
+SKIP:
   {
-   no indirect;
-   eval "die qq{the code compiled but it shouldn't have\n}; $_";
+   skip "$_: $skip" => 6 if eval $skip;
+
+   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
+
+   eval "die qq{ok\\n}; $prefix; use indirect; $_";
+   is($@, "ok\n", "use indirect: $_");
+
+   eval "die qq{the code compiled but it shouldn't have\n}; $prefix; no indirect; $_";
+   like($@, expect('Hlagh'), "no indirect: $_");
+
+   s/Hlagh/Dongs/g;
+
+   eval "die qq{ok\\n}; $prefix; use indirect; $_";
+   is($@, "ok\n", "use indirect, defined: $_");
+
+   eval "die qq{the code compiled but it shouldn't have\n}; $prefix; no indirect; $_";
+   like($@, expect('Dongs'), "no indirect, defined: $_");
+
+   s/\$/\$ \n\t /g;
+   s/Dongs/Hlagh/g;
+
+   eval "die qq{ok\\n}; $prefix; use indirect; $_";
+   is($@, "ok\n", "use indirect, spaces: $_");
+
+   eval "die qq{the code compiled but it shouldn't have\n}; $prefix; no indirect; $_";
+   like($@, expect('Hlagh'), "no indirect, spaces: $_");
   }
-  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: $_");
  }
 }
 
 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__
+
 $obj = new Hlagh;
 ####
 $obj = new Hlagh();
@@ -114,12 +133,50 @@ 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;
+#### $] < 5.010 # use feature 'state'; state $z
+meh $z;
+#### $] < 5.010 # use feature 'state'; state $z
+meh $z 1, 2;
+#### $] < 5.010 # use feature 'state'; state $z
+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();