X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F11-veq.t;h=dab1e0542949c7cbae4f6695a0b14a69918ba70d;hb=fecf68fc9030feb1afe2a82f685ade1216ec31f1;hp=418e13e29b0676bdb65481e32cadde19368d521a;hpb=f77706f0734eb34a9623cc492b5d73061fba9b62;p=perl%2Fmodules%2FScalar-Vec-Util.git

diff --git a/t/11-veq.t b/t/11-veq.t
index 418e13e..dab1e05 100644
--- a/t/11-veq.t
+++ b/t/11-veq.t
@@ -5,34 +5,40 @@ use warnings;
 
 use Test::More 'no_plan';
 
-use Scalar::Vec::Util qw/veq SVU_SIZE/;
-
-eval { veq undef, 0, my $y, 0, 0 };
-like($@, qr/Invalid\s+argument/, 'first argument undef croaks');
-eval { veq my $x, undef, my $y, 0, 0 };
-like($@, qr/Invalid\s+argument/, 'second argument undef croaks');
-eval { veq my $x, 0, undef, 0, 0 };
-like($@, qr/Invalid\s+argument/, 'third argument undef croaks');
-eval { veq my $x, 0, my $y, undef, 0 };
-like($@, qr/Invalid\s+argument/, 'fourth argument undef croaks');
-eval { veq my $x, 0, my $y, 0, undef };
-like($@, qr/Invalid\s+argument/, 'fifth argument undef croaks');
+use Scalar::Vec::Util qw<veq SVU_SIZE>;
+
+for ([ 1, 'offset', -1 ], [ 3, 'offset', '-1' ], [ 4, 'length', -1 ]) {
+ my @args  = ('1') x 5;
+ $args[$_->[0]] = $_->[2];
+ local $@;
+ eval { &veq(@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(@args) failed";
+}
 
 my $p = SVU_SIZE;
-$p = 8 if $p < 8;
+$p    = 8 if $p < 8;
 my $n = 3 * $p;
 my $q = 1;
 
-*myfill = *Scalar::Vec::Util::vfill_pp;
+sub myfill {
+ 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;
 
@@ -40,12 +46,14 @@ my @s = ($p - $q) .. ($p + $q);
 for my $s1 (@s) {
  for my $s2 (@s) {
   for my $l (0 .. $n - 1) {
-   last if $s1 + $l > $n or $s2 + $l > $n;
+   next if $s1 + $l > $n or $s2 + $l > $n;
    pat $v1, $s1, $l, 0;
    pat $v2, $s2, $l, 0;
-   ok(veq($v1 => $s1, $v2 => $s2, $l), "veq $s1, $s2, $l");
-   ok(!veq($v1 => $s1 - 1, $v2 => $s2, $l), 'not veq_pp ' . ($s1 - 1) . ", $s2, $l") if $l > 0;
-   ok(!veq($v1 => $s1 + 1, $v2 => $s2, $l), 'not veq_pp ' . ($s1 + 1) . ", $s2, $l") if $l > 0;
+   ok   veq($v1 => $s1,     $v2 => $s2, $l), "veq $s1, $s2, $l";
+   if ($l > 0) {
+    ok !veq($v1 => $s1 - 1, $v2 => $s2, $l), 'not veq ' . ($s1-1) . ", $s2, $l";
+    ok !veq($v1 => $s1 + 1, $v2 => $s2, $l), 'not veq ' . ($s1+1) . ", $s2, $l";
+   }
   }
  }
 }