X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F22-bad-mixed.t;h=bcb9203410cef9d7b6c96e6f9c87f608f87c9d79;hp=8cc0931aa9c28fd53f25a01ad702d05d49de7e5c;hb=b58bc186ae53367c8df3b55e162f101c8e102a8d;hpb=256486fe8cf158890b5bd5048d7467d6809b4f2e

diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
index 8cc0931..bcb9203 100644
--- a/t/22-bad-mixed.t
+++ b/t/22-bad-mixed.t
@@ -1,6 +1,6 @@
 #!perl -T
 
-package Dongs;
+package NotEmpty;
 
 sub new;
 
@@ -9,10 +9,24 @@ package main;
 use strict;
 use warnings;
 
-use Test::More tests => 3 * 4;
+use Test::More tests => 3 * 9;
+
+BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
 sub meh;
 
+my @warns;
+
+sub try {
+ my ($code) = @_;
+
+ @warns = ();
+ {
+  local $SIG{__WARN__} = sub { push @warns, @_ };
+  eval $code;
+ }
+}
+
 {
  local $/ = "####";
  while (<DATA>) {
@@ -26,31 +40,42 @@ sub meh;
 
 SKIP:
   {
-   skip "$_: $skip" => 4 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{ok\n}; $prefix; no indirect; $_";
-   is($@, "ok\n", "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($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"meh"\s+on\s+object\s+"Dongs"/, "no indirect, defined: $_");
+   skip "$_: $skip" => 9 if do { local $@; eval $skip };
+
+   {
+    local $_ = $_;
+    s/Pkg/Empty/g;
+
+    try "return; $prefix; use indirect; $_";
+    is $@,     '', "use indirect: $_";
+    is @warns, 0,  'correct number of reports';
+
+    try "return; $prefix; no indirect; $_";
+    is $@,     '', "no indirect: $_";
+    is @warns, 0,  'correct number of reports';
+   }
+
+   {
+    local $_ = $_;
+    s/Pkg/NotEmpty/g;
+
+    try "return; $prefix; use indirect; $_";
+    is $@,     '', "use indirect, defined: $_";
+    is @warns, 0,  'correct number of reports';
+
+    try "return; $prefix; no indirect; $_";
+    is $@,          '', "use indirect, defined: $_";
+    is @warns,      1,  'correct number of reports';
+    like $warns[0], qr/^Indirect call of method "meh" on object "NotEmpty" at \(eval \d+\) line \d+/, 'report 0 is correct';
+   }
   }
  }
 }
 
 __DATA__
 
-meh Hlagh->new;
+meh Pkg->new;
 ####
-meh Hlagh->new();
+meh Pkg->new();
 ####
-meh Hlagh->new, "Wut";
+meh Pkg->new, "Wut";