Move shared expected_payload/payload_ok subs into module.

t/05-ipv6.pl

@@ -6,6 +6,7 @@
 
 use lib 't/lib';
 use LSF;
+use Test::LogSyslogFast;
 
 eval 'local $^W = 0; use IO::Socket::INET6;';
 
@@ -143,7 +144,7 @@
             ok($buf =~ /test2\[/, "$p: ->send after set_name has the right name");
             ok($buf =~ /\[12345\]/, "$p: ->send after set_name has the right pid");
             ok($buf =~ /$msg$/, "$p: ->send after accessors sends right message");
-            ok(payload_ok($buf, @payload_params), "$p: ->send $msg has correct payload");
+            payload_ok($buf, @payload_params, "$p: ->send $msg has correct payload");
         }
     };
     diag($@) if $@;
@@ -205,23 +206,6 @@
 };
 like($@, qr{at t/05-ipv6.}, 'error in caller'); # not Fast.pm
 
-sub expected_payload {
-    my ($facility, $severity, $sender, $name, $pid, $msg, $time) = @_;
-    return sprintf "<%d>%s %s %s[%d]: %s",
-        ($facility << 3) | $severity,
-        strftime("%h %e %T", localtime($time)),
-        $sender, $name, $pid, $msg;
-}
-
-sub payload_ok {
-    my ($payload, @payload_params) = @_;
-    for my $offset (0, -1, 1) {
-        my $allowed = expected_payload(@payload_params);
-        return 1 if $allowed eq $payload;
-    }
-    return 0;
-}
-
 }
 
 # vim: filetype=perl

t/06-large-strings.pl

@@ -5,6 +5,7 @@
 
 use lib 't/lib';
 use LSF;
+use Test::LogSyslogFast;
 
 # strerror(3) messages on linux in the "C" locale are included below for reference
 
@@ -43,27 +44,10 @@
 
             ok($buf =~ /^<38>/, "$p: ->send has the right priority");
             ok($buf =~ /$msg$/, "$p: ->send has the right message");
-            ok(payload_ok($buf, @payload_params), "$p: ->send has correct payload");
+            payload_ok($buf, @payload_params, "$p: ->send has correct payload");
         }
     };
     diag($@) if $@;
 }
 
-sub expected_payload {
-    my ($facility, $severity, $sender, $name, $pid, $msg, $time) = @_;
-    return sprintf "<%d>%s %s %s[%d]: %s",
-        ($facility << 3) | $severity,
-        strftime("%h %e %T", localtime($time)),
-        $sender, $name, $pid, $msg;
-}
-
-sub payload_ok {
-    my ($payload, @payload_params) = @_;
-    for my $offset (0, -1, 1) {
-        my $allowed = expected_payload(@payload_params);
-        return 1 if $allowed eq $payload;
-    }
-    return 0;
-}
-
 1;

t/lib/Test/LogSyslogFast.pm

@@ -0,0 +1,33 @@
+package Test::LogSyslogFast;
+
+use base 'Test::Builder::Module';
+@EXPORT = qw(payload_ok expected_payload);
+
+use POSIX 'strftime';
+
+my $Tester = Test::Builder->new();
+
+sub expected_payload {
+    my ($facility, $severity, $sender, $name, $pid, $msg, $time) = @_;
+    return sprintf "<%d>%s %s %s[%d]: %s",
+        ($facility << 3) | $severity,
+        strftime("%h %e %T", localtime($time)),
+        $sender, $name, $pid, $msg;
+}
+
+sub payload_ok ($@;$) {
+    my ($payload, @payload_params, $text) = @_;
+    for my $offset (0, -1, 1) {
+        my $allowed = expected_payload(@payload_params);
+
+        if ($allowed eq $payload) {
+            $Tester->ok(1,$text);
+            return 1;
+        }
+    }
+
+    $Tester->ok(0,$text);    
+    return 0;
+}
+
+1;