Factorize the regexp in t/20-bad.t

diff --git a/t/20-bad.t b/t/20-bad.t
index 57df08fb0d5aad6acec2ed8ff9a103ab43948a1f..8bd5602258260e7d5b2230be65bbcd3b56941eac 100644 (file)
--- a/t/20-bad.t
+++ b/t/20-bad.t
@@ -14,6 +14,11 @@ use Test::More tests => 44 * 4 + 2;
 my ($obj, $x);
 our ($y, $bloop);
 
 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";
  while (<DATA>) {
 {
  local $/ = "####\n";
  while (<DATA>) {


@@ -28,7 +33,7 @@ our ($y, $bloop);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
    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|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect: $_");
+  like($@, expect('Hlagh'), "no indirect: $_");

   s/Hlagh/Dongs/g;
   {
    use indirect;
   s/Hlagh/Dongs/g;
   {
    use indirect;


@@ -39,7 +44,7 @@ our ($y, $bloop);
    no indirect;
    eval "die qq{the code compiled but it shouldn't have\n}; $_";
   }
    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|\$[xy_]|\$(?:sploosh::)?sploosh|\$(?:main::)?bloop)"/, "no indirect, defined: $_");
+  like($@, expect('Dongs'), "no indirect, defined: $_");

  }
 }
 
  }
 }