Restyle tests

[perl/modules/Scalar-Vec-Util.git] / t / 10-veq-pp.t

diff --git a/t/10-veq-pp.t b/t/10-veq-pp.t
index 509fd98f3cba1989c96a62681e9f0e1535340961..78092cceb73b013b928db6bdaca2adb7ad83b7fa 100644 (file)
--- a/t/10-veq-pp.t
+++ b/t/10-veq-pp.t
@@ -10,8 +10,12 @@ use Scalar::Vec::Util;
 for ([ 1, 'offset', -1 ], [ 3, 'offset', '-1' ], [ 4, 'length', -1 ]) {
  my @args  = ('1') x 5;
  $args[$_->[0]] = $_->[2];
- eval { &Scalar::Vec::Util::veq_pp(@args) }; my $line = __LINE__;
- like $@, qr/^Invalid\s+negative\s+$_->[1]\s+at\s+\Q$0\E\s+line\s+$line/;
+ local $@;
+ eval { &Scalar::Vec::Util::veq_pp(@args) };
+ my $err  = $@;
+ my $line = __LINE__-2;
+ like $err, qr/^Invalid\s+negative\s+$_->[1]\s+at\s+\Q$0\E\s+line\s+$line/,
+      "veq_pp(@args) failed";
 }
 
 my $p = 8;
@@ -19,19 +23,21 @@ my $n = 3 * $p;
 my $q = 1;
 
 sub myfill {
- (undef, my $s, my $l, my $x) = @_;
+ my (undef, $s, $l, $x) = @_;
  $x = 1 if $x;
  vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
 }
 
-sub rst { myfill($_[0], 0, $n, 0) }
-  
+sub rst {
+ myfill $_[0], 0, $n, 0;
+}
+
 sub pat {
- (undef, my $a, my $b, my $x) = @_;
- myfill($_[0], 0, $a, $x);
- myfill($_[0], $a, $b, 1 - $x);
- myfill($_[0], $a + $b, $n - ($a + $b) , $x);
-}  
+ my (undef, $a, $b, $x) = @_;
+ myfill $_[0], 0,       $a,             $x;
+ myfill $_[0], $a,      $b,             1 - $x;
+ myfill $_[0], $a + $b, $n - ($a + $b), $x;
+}
 
 my ($v1, $v2) = ('') x 2;
 
@@ -42,9 +48,14 @@ for my $s1 (@s) {
    last if $s1 + $l > $n or $s2 + $l > $n;
    pat $v1, $s1, $l, 0;
    pat $v2, $s2, $l, 0;
-   ok(Scalar::Vec::Util::veq_pp($v1 => $s1, $v2 => $s2, $l), "veq_pp $s1, $s2, $l");
-   ok(!Scalar::Vec::Util::veq_pp($v1 => $s1 - 1, $v2 => $s2, $l), 'not veq_pp ' . ($s1 - 1) . ", $s2, $l") if $l > 0;
-   ok(!Scalar::Vec::Util::veq_pp($v1 => $s1 + 1, $v2 => $s2, $l), 'not veq_pp ' . ($s1 + 1) . ", $s2, $l") if $l > 0;
+   ok   Scalar::Vec::Util::veq_pp($v1 => $s1,     $v2 => $s2, $l),
+        "veq_pp $s1, $s2, $l";
+   if ($l > 0) {
+    ok !Scalar::Vec::Util::veq_pp($v1 => $s1 - 1, $v2 => $s2, $l),
+        'not veq_pp ' . ($s1-1) . ", $s2, $l";
+    ok !Scalar::Vec::Util::veq_pp($v1 => $s1 + 1, $v2 => $s2, $l),
+        'not veq_pp ' . ($s1+1) . ", $s2, $l";
+   }
   }
  }
 }