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

diff --git a/t/20-bad.t b/t/20-bad.t
index 05efb50..0321c20 100644
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -1,31 +1,78 @@
 #!perl -T
 
+package Dongs;
+
+sub new;
+
+package main;
+
 use strict;
 use warnings;
 
-use Test::More tests => 28 * 2;
+use Test::More tests => 50 * 6 + 2;
 
-my ($obj, $pkg, $cb, $x);
+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;
-   local $SIG{__WARN__} = sub { die 'warn:' . join(' ', @_) };
    eval "die qq{ok\\n}; $_";
   }
-  is($@, "ok\n", $_);
+  is($@, "ok\n", "use indirect: $_");
   {
    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|\$_)"/, $_);
+  like($@, expect('Hlagh'), "no indirect: $_");
+  s/Hlagh/Dongs/g;
+  {
+   use indirect;
+   eval "die qq{ok\\n}; $_";
+  }
+  is($@, "ok\n", "use indirect, defined: $_");
+  {
+   no indirect;
+   eval "die qq{the code compiled but it shouldn't have\n}; $_";
+  }
+  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: $_");
  }
 }
 
+eval {
+ no indirect 'hlagh';
+ my $warn;
+ local $SIG{__WARN__} = sub { $warn = join ' ', @_ };
+ 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');
+}
+
 __DATA__
 $obj = new Hlagh;
 ####
@@ -84,10 +131,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
@@ -95,3 +192,7 @@ $obj = HlaghHlagh Hlagh; # HlaghHlagh Hlagh
 $obj = new newnew;
 ####
 $obj = new newnew; # new newnew
+####
+new Hlagh (meh $x)
+####
+Hlagh->new(meh $x)