X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2Findirect.git;a=blobdiff_plain;f=t%2F22-bad-mixed.t;h=cff75658737a885ebd4a3da0bd9c895e01942bcd;hp=bbc2f23eb8f959e23987b99d99b50d144b40a975;hb=4168177ad46806cfb9e0cdb522aed997215cf8b2;hpb=f4e7787d7c015980abba9a8d76f0293f24e0ab94

diff --git a/t/22-bad-mixed.t b/t/22-bad-mixed.t
index bbc2f23..cff7565 100644
--- a/t/22-bad-mixed.t
+++ b/t/22-bad-mixed.t
@@ -9,40 +9,68 @@ 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 $/ = "####\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{ok\n}; $_";
-  }
-  is($@, "ok\n", "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" => 9 if eval $skip;
+
+   {
+    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/Hlagh/Dongs/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 "Dongs" at \(eval \d+\) line \d+/, 'report 0 is correct';
+   }
   }
-  like($@, qr/^warn:Indirect\s+call\s+of\s+method\s+"meh"\s+on\s+object\s+"Dongs"/, "no indirect, defined: $_");
  }
 }
 
 __DATA__
+
 meh Hlagh->new;
 ####
 meh Hlagh->new();