In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/c299d03b5bebd7013bbf77d78a58826ab4d27179?hp=f7e3d3266d17243c5ff03ec4aa7b2e1a457623ae>
- Log -----------------------------------------------------------------
commit c299d03b5bebd7013bbf77d78a58826ab4d27179
Author: Nicholas Clark <n...@ccl4.org>
Date: Sat Sep 11 18:47:28 2010 +0100
Remove obsolete test boilerplate from Math::BigInt::FastCalc.
M dist/Math-BigInt-FastCalc/t/leak.t
M dist/Math-BigInt-FastCalc/t/mbi_rand.t
commit 5ca2dbe59672be76c7ef2e27ca12f758c4441f96
Author: Nicholas Clark <n...@ccl4.org>
Date: Sat Sep 11 18:20:54 2010 +0100
Convert Math::BigInt::FastCalc tests from Test to Test::More.
M dist/Math-BigInt-FastCalc/t/bigintfc.t
M dist/Math-BigInt-FastCalc/t/bootstrap.t
-----------------------------------------------------------------------
Summary of changes:
dist/Math-BigInt-FastCalc/t/bigintfc.t | 374 +++++++++++++++----------------
dist/Math-BigInt-FastCalc/t/bootstrap.t | 16 +-
dist/Math-BigInt-FastCalc/t/leak.t | 9 +-
dist/Math-BigInt-FastCalc/t/mbi_rand.t | 19 +--
4 files changed, 193 insertions(+), 225 deletions(-)
diff --git a/dist/Math-BigInt-FastCalc/t/bigintfc.t
b/dist/Math-BigInt-FastCalc/t/bigintfc.t
index c8f5f4b..585ec75 100644
--- a/dist/Math-BigInt-FastCalc/t/bigintfc.t
+++ b/dist/Math-BigInt-FastCalc/t/bigintfc.t
@@ -1,15 +1,7 @@
#!/usr/bin/perl -w
use strict;
-use Test;
-
-BEGIN
- {
- $| = 1;
- unshift @INC, '../lib'; # for running manually
- unshift @INC, '../blib/arch'; # for running manually
- plan tests => 359;
- }
+use Test::More tests => 359;
use Math::BigInt::FastCalc;
@@ -28,249 +20,249 @@ my $C = 'Math::BigInt::FastCalc'; # pass
classname to sub's
# _new and _str
my $x = $C->_new("123"); my $y = $C->_new("321");
-ok (ref($x),'ARRAY'); ok ($C->_str($x),123); ok ($C->_str($y),321);
+is (ref($x),'ARRAY'); is ($C->_str($x),123); is ($C->_str($y),321);
###############################################################################
# _add, _sub, _mul, _div
-ok ($C->_str($C->_add($x,$y)),444);
-ok ($C->_str($C->_sub($x,$y)),123);
-ok ($C->_str($C->_mul($x,$y)),39483);
-ok ($C->_str($C->_div($x,$y)),123);
+is ($C->_str($C->_add($x,$y)),444);
+is ($C->_str($C->_sub($x,$y)),123);
+is ($C->_str($C->_mul($x,$y)),39483);
+is ($C->_str($C->_div($x,$y)),123);
###############################################################################
# check that mul/div doesn't change $y
# and returns the same reference, not something new
-ok ($C->_str($C->_mul($x,$y)),39483);
-ok ($C->_str($x),39483); ok ($C->_str($y),321);
+is ($C->_str($C->_mul($x,$y)),39483);
+is ($C->_str($x),39483); is ($C->_str($y),321);
-ok ($C->_str($C->_div($x,$y)),123);
-ok ($C->_str($x),123); ok ($C->_str($y),321);
+is ($C->_str($C->_div($x,$y)),123);
+is ($C->_str($x),123); is ($C->_str($y),321);
$x = $C->_new("39483");
my ($x1,$r1) = $C->_div($x,$y);
-ok ("$x1","$x");
+is ("$x1","$x");
$C->_inc($x1);
-ok ("$x1","$x");
-ok ($C->_str($r1),'0');
+is ("$x1","$x");
+is ($C->_str($r1),'0');
$x = $C->_new("39483"); # reset
###############################################################################
my $z = $C->_new("2");
-ok ($C->_str($C->_add($x,$z)),39485);
+is ($C->_str($C->_add($x,$z)),39485);
my ($re,$rr) = $C->_div($x,$y);
-ok ($C->_str($re),123); ok ($C->_str($rr),2);
+is ($C->_str($re),123); is ($C->_str($rr),2);
# is_zero, _is_one, _one, _zero
-ok ($C->_is_zero($x)||0,0);
-ok ($C->_is_one($x)||0,0);
+is ($C->_is_zero($x),'');
+is ($C->_is_one($x),'');
-ok ($C->_str($C->_zero()),"0");
-ok ($C->_str($C->_one()),"1");
+is ($C->_str($C->_zero()),"0");
+is ($C->_str($C->_one()),"1");
# _two() and _ten()
-ok ($C->_str($C->_two()),"2");
-ok ($C->_str($C->_ten()),"10");
-ok ($C->_is_ten($C->_two())||0,0);
-ok ($C->_is_two($C->_two()),1);
-ok ($C->_is_ten($C->_ten()),1);
-ok ($C->_is_two($C->_ten())||0,0);
+is ($C->_str($C->_two()),"2");
+is ($C->_str($C->_ten()),"10");
+is ($C->_is_ten($C->_two()),'');
+is ($C->_is_two($C->_two()),1);
+is ($C->_is_ten($C->_ten()),1);
+is ($C->_is_two($C->_ten()),'');
-ok ($C->_is_one($C->_one()),1);
-ok ($C->_is_one($C->_two()) || 0,0);
-ok ($C->_is_one($C->_ten()) || 0,0);
+is ($C->_is_one($C->_one()),1);
+is ($C->_is_one($C->_two()), '');
+is ($C->_is_one($C->_ten()), '');
-ok ($C->_is_one($C->_zero()) || 0,0);
+is ($C->_is_one($C->_zero()), '');
-ok ($C->_is_zero($C->_zero()),1);
+is ($C->_is_zero($C->_zero()),1);
-ok ($C->_is_zero($C->_one()) || 0,0);
+is ($C->_is_zero($C->_one()), '');
# is_odd, is_even
-ok ($C->_is_odd($C->_one()),1); ok ($C->_is_odd($C->_zero())||0,0);
-ok ($C->_is_even($C->_one()) || 0,0); ok ($C->_is_even($C->_zero()),1);
+is ($C->_is_odd($C->_one()),1); is ($C->_is_odd($C->_zero()),'');
+is ($C->_is_even($C->_one()), ''); is ($C->_is_even($C->_zero()),1);
# _len
for my $method (qw/_alen _len/)
{
- $x = $C->_new("1"); ok ($C->$method($x),1);
- $x = $C->_new("12"); ok ($C->$method($x),2);
- $x = $C->_new("123"); ok ($C->$method($x),3);
- $x = $C->_new("1234"); ok ($C->$method($x),4);
- $x = $C->_new("12345"); ok ($C->$method($x),5);
- $x = $C->_new("123456"); ok ($C->$method($x),6);
- $x = $C->_new("1234567"); ok ($C->$method($x),7);
- $x = $C->_new("12345678"); ok ($C->$method($x),8);
- $x = $C->_new("123456789"); ok ($C->$method($x),9);
-
- $x = $C->_new("8"); ok ($C->$method($x),1);
- $x = $C->_new("21"); ok ($C->$method($x),2);
- $x = $C->_new("321"); ok ($C->$method($x),3);
- $x = $C->_new("4321"); ok ($C->$method($x),4);
- $x = $C->_new("54321"); ok ($C->$method($x),5);
- $x = $C->_new("654321"); ok ($C->$method($x),6);
- $x = $C->_new("7654321"); ok ($C->$method($x),7);
- $x = $C->_new("87654321"); ok ($C->$method($x),8);
- $x = $C->_new("987654321"); ok ($C->$method($x),9);
-
- $x = $C->_new("0"); ok ($C->$method($x),1);
- $x = $C->_new("20"); ok ($C->$method($x),2);
- $x = $C->_new("320"); ok ($C->$method($x),3);
- $x = $C->_new("4320"); ok ($C->$method($x),4);
- $x = $C->_new("54320"); ok ($C->$method($x),5);
- $x = $C->_new("654320"); ok ($C->$method($x),6);
- $x = $C->_new("7654320"); ok ($C->$method($x),7);
- $x = $C->_new("87654320"); ok ($C->$method($x),8);
- $x = $C->_new("987654320"); ok ($C->$method($x),9);
+ $x = $C->_new("1"); is ($C->$method($x),1);
+ $x = $C->_new("12"); is ($C->$method($x),2);
+ $x = $C->_new("123"); is ($C->$method($x),3);
+ $x = $C->_new("1234"); is ($C->$method($x),4);
+ $x = $C->_new("12345"); is ($C->$method($x),5);
+ $x = $C->_new("123456"); is ($C->$method($x),6);
+ $x = $C->_new("1234567"); is ($C->$method($x),7);
+ $x = $C->_new("12345678"); is ($C->$method($x),8);
+ $x = $C->_new("123456789"); is ($C->$method($x),9);
+
+ $x = $C->_new("8"); is ($C->$method($x),1);
+ $x = $C->_new("21"); is ($C->$method($x),2);
+ $x = $C->_new("321"); is ($C->$method($x),3);
+ $x = $C->_new("4321"); is ($C->$method($x),4);
+ $x = $C->_new("54321"); is ($C->$method($x),5);
+ $x = $C->_new("654321"); is ($C->$method($x),6);
+ $x = $C->_new("7654321"); is ($C->$method($x),7);
+ $x = $C->_new("87654321"); is ($C->$method($x),8);
+ $x = $C->_new("987654321"); is ($C->$method($x),9);
+
+ $x = $C->_new("0"); is ($C->$method($x),1);
+ $x = $C->_new("20"); is ($C->$method($x),2);
+ $x = $C->_new("320"); is ($C->$method($x),3);
+ $x = $C->_new("4320"); is ($C->$method($x),4);
+ $x = $C->_new("54320"); is ($C->$method($x),5);
+ $x = $C->_new("654320"); is ($C->$method($x),6);
+ $x = $C->_new("7654320"); is ($C->$method($x),7);
+ $x = $C->_new("87654320"); is ($C->$method($x),8);
+ $x = $C->_new("987654320"); is ($C->$method($x),9);
for (my $i = 1; $i < 9; $i++)
{
my $a = "$i" . '0' x ($i-1);
$x = $C->_new($a);
- print "# Tried len '$a'\n" unless ok ($C->_len($x),$i);
+ print "# Tried len '$a'\n" unless is ($C->_len($x),$i);
}
}
# _digit
$x = $C->_new("123456789");
-ok ($C->_digit($x,0),9);
-ok ($C->_digit($x,1),8);
-ok ($C->_digit($x,2),7);
-ok ($C->_digit($x,-1),1);
-ok ($C->_digit($x,-2),2);
-ok ($C->_digit($x,-3),3);
+is ($C->_digit($x,0),9);
+is ($C->_digit($x,1),8);
+is ($C->_digit($x,2),7);
+is ($C->_digit($x,-1),1);
+is ($C->_digit($x,-2),2);
+is ($C->_digit($x,-3),3);
# _copy
foreach (qw/ 1 12 123 1234 12345 123456 1234567 12345678 123456789/)
{
$x = $C->_new("$_");
- ok ($C->_str($C->_copy($x)),"$_");
- ok ($C->_str($x),"$_"); # did _copy destroy original x?
+ is ($C->_str($C->_copy($x)),"$_");
+ is ($C->_str($x),"$_"); # did _copy destroy original x?
}
# _zeros
-$x = $C->_new("1256000000"); ok ($C->_zeros($x),6);
-$x = $C->_new("152"); ok ($C->_zeros($x),0);
-$x = $C->_new("123000"); ok ($C->_zeros($x),3);
-$x = $C->_new("0"); ok ($C->_zeros($x),0);
+$x = $C->_new("1256000000"); is ($C->_zeros($x),6);
+$x = $C->_new("152"); is ($C->_zeros($x),0);
+$x = $C->_new("123000"); is ($C->_zeros($x),3);
+$x = $C->_new("0"); is ($C->_zeros($x),0);
# _lsft, _rsft
$x = $C->_new("10"); $y = $C->_new("3");
-ok ($C->_str($C->_lsft($x,$y,10)),10000);
+is ($C->_str($C->_lsft($x,$y,10)),10000);
$x = $C->_new("20"); $y = $C->_new("3");
-ok ($C->_str($C->_lsft($x,$y,10)),20000);
+is ($C->_str($C->_lsft($x,$y,10)),20000);
$x = $C->_new("128"); $y = $C->_new("4");
-ok ($C->_str($C->_lsft($x,$y,2)), 128 << 4);
+is ($C->_str($C->_lsft($x,$y,2)), 128 << 4);
$x = $C->_new("1000"); $y = $C->_new("3");
-ok ($C->_str($C->_rsft($x,$y,10)),1);
+is ($C->_str($C->_rsft($x,$y,10)),1);
$x = $C->_new("20000"); $y = $C->_new("3");
-ok ($C->_str($C->_rsft($x,$y,10)),20);
+is ($C->_str($C->_rsft($x,$y,10)),20);
$x = $C->_new("256"); $y = $C->_new("4");
-ok ($C->_str($C->_rsft($x,$y,2)),256 >> 4);
+is ($C->_str($C->_rsft($x,$y,2)),256 >> 4);
$x = $C->_new("6411906467305339182857313397200584952398");
$y = $C->_new("45");
-ok ($C->_str($C->_rsft($x,$y,10)),0);
+is ($C->_str($C->_rsft($x,$y,10)),0);
# _acmp
$x = $C->_new("123456789");
$y = $C->_new("987654321");
-ok ($C->_acmp($x,$y),-1);
-ok ($C->_acmp($y,$x),1);
-ok ($C->_acmp($x,$x),0);
-ok ($C->_acmp($y,$y),0);
+is ($C->_acmp($x,$y),-1);
+is ($C->_acmp($y,$x),1);
+is ($C->_acmp($x,$x),0);
+is ($C->_acmp($y,$y),0);
$x = $C->_new("12");
$y = $C->_new("12");
-ok ($C->_acmp($x,$y),0);
+is ($C->_acmp($x,$y),0);
$x = $C->_new("21");
-ok ($C->_acmp($x,$y),1);
-ok ($C->_acmp($y,$x),-1);
+is ($C->_acmp($x,$y),1);
+is ($C->_acmp($y,$x),-1);
$x = $C->_new("123456789");
$y = $C->_new("1987654321");
-ok ($C->_acmp($x,$y),-1);
-ok ($C->_acmp($y,$x),+1);
+is ($C->_acmp($x,$y),-1);
+is ($C->_acmp($y,$x),+1);
$x = $C->_new("1234567890123456789");
$y = $C->_new("987654321012345678");
-ok ($C->_acmp($x,$y),1);
-ok ($C->_acmp($y,$x),-1);
-ok ($C->_acmp($x,$x),0);
-ok ($C->_acmp($y,$y),0);
+is ($C->_acmp($x,$y),1);
+is ($C->_acmp($y,$x),-1);
+is ($C->_acmp($x,$x),0);
+is ($C->_acmp($y,$y),0);
$x = $C->_new("1234");
$y = $C->_new("987654321012345678");
-ok ($C->_acmp($x,$y),-1);
-ok ($C->_acmp($y,$x),1);
-ok ($C->_acmp($x,$x),0);
-ok ($C->_acmp($y,$y),0);
+is ($C->_acmp($x,$y),-1);
+is ($C->_acmp($y,$x),1);
+is ($C->_acmp($x,$x),0);
+is ($C->_acmp($y,$y),0);
# _modinv
$x = $C->_new("8");
$y = $C->_new("5033");
my ($xmod,$sign) = $C->_modinv($x,$y);
-ok ($C->_str($xmod),'629'); # -629 % 5033 == 4404
-ok ($sign, '-');
+is ($C->_str($xmod),'629'); # -629 % 5033 == 4404
+is ($sign, '-');
# _div
$x = $C->_new("3333"); $y = $C->_new("1111");
-ok ($C->_str(scalar $C->_div($x,$y)),3);
+is ($C->_str(scalar $C->_div($x,$y)),3);
$x = $C->_new("33333"); $y = $C->_new("1111"); ($x,$y) = $C->_div($x,$y);
-ok ($C->_str($x),30); ok ($C->_str($y),3);
+is ($C->_str($x),30); is ($C->_str($y),3);
$x = $C->_new("123"); $y = $C->_new("1111");
-($x,$y) = $C->_div($x,$y); ok ($C->_str($x),0); ok ($C->_str($y),123);
+($x,$y) = $C->_div($x,$y); is ($C->_str($x),0); is ($C->_str($y),123);
# _num
foreach (qw/1 12 123 1234 12345 1234567 12345678 123456789 1234567890/)
{
$x = $C->_new("$_");
- ok (ref($x)||'','ARRAY'); ok ($C->_str($x),"$_");
- $x = $C->_num($x); ok (ref($x)||'',''); ok ($x,$_);
+ is (ref($x),'ARRAY'); is ($C->_str($x),"$_");
+ $x = $C->_num($x); is (ref($x),''); is ($x,$_);
}
# _sqrt
-$x = $C->_new("144"); ok ($C->_str($C->_sqrt($x)),'12');
-$x = $C->_new("144000000000000"); ok ($C->_str($C->_sqrt($x)),'12000000');
+$x = $C->_new("144"); is ($C->_str($C->_sqrt($x)),'12');
+$x = $C->_new("144000000000000"); is ($C->_str($C->_sqrt($x)),'12000000');
# _root
$x = $C->_new("81"); my $n = $C->_new("3"); # 4*4*4 = 64, 5*5*5 = 125
-ok ($C->_str($C->_root($x,$n)),'4'); # 4.xx => 4.0
+is ($C->_str($C->_root($x,$n)),'4'); # 4.xx => 4.0
$x = $C->_new("81"); $n = $C->_new("4"); # 3*3*3*3 == 81
-ok ($C->_str($C->_root($x,$n)),'3');
+is ($C->_str($C->_root($x,$n)),'3');
# _pow (and _root)
$x = $C->_new("0"); $n = $C->_new("3"); # 0 ** y => 0
-ok ($C->_str($C->_pow($x,$n)), 0);
+is ($C->_str($C->_pow($x,$n)), 0);
$x = $C->_new("3"); $n = $C->_new("0"); # x ** 0 => 1
-ok ($C->_str($C->_pow($x,$n)), 1);
+is ($C->_str($C->_pow($x,$n)), 1);
$x = $C->_new("1"); $n = $C->_new("3"); # 1 ** y => 1
-ok ($C->_str($C->_pow($x,$n)), 1);
+is ($C->_str($C->_pow($x,$n)), 1);
$x = $C->_new("5"); $n = $C->_new("1"); # x ** 1 => x
-ok ($C->_str($C->_pow($x,$n)), 5);
+is ($C->_str($C->_pow($x,$n)), 5);
$x = $C->_new("81"); $n = $C->_new("3"); # 81 ** 3 == 531441
-ok ($C->_str($C->_pow($x,$n)),81 ** 3);
+is ($C->_str($C->_pow($x,$n)),81 ** 3);
-ok ($C->_str($C->_root($x,$n)),81);
+is ($C->_str($C->_root($x,$n)),81);
$x = $C->_new("81");
-ok ($C->_str($C->_pow($x,$n)),81 ** 3);
-ok ($C->_str($C->_pow($x,$n)),'150094635296999121'); # 531441 ** 3 ==
+is ($C->_str($C->_pow($x,$n)),81 ** 3);
+is ($C->_str($C->_pow($x,$n)),'150094635296999121'); # 531441 ** 3 ==
-ok ($C->_str($C->_root($x,$n)),'531441');
-ok ($C->_str($C->_root($x,$n)),'81');
+is ($C->_str($C->_root($x,$n)),'531441');
+is ($C->_str($C->_root($x,$n)),'81');
$x = $C->_new("81"); $n = $C->_new("14");
-ok ($C->_str($C->_pow($x,$n)),'523347633027360537213511521');
-ok ($C->_str($C->_root($x,$n)),'81');
+is ($C->_str($C->_pow($x,$n)),'523347633027360537213511521');
+is ($C->_str($C->_root($x,$n)),'81');
$x = $C->_new("523347633027360537213511520");
-ok ($C->_str($C->_root($x,$n)),'80');
+is ($C->_str($C->_root($x,$n)),'80');
$x = $C->_new("523347633027360537213511522");
-ok ($C->_str($C->_root($x,$n)),'81');
+is ($C->_str($C->_root($x,$n)),'81');
my $res = [ qw/ 9 31 99 316 999 3162 9999/ ];
@@ -281,38 +273,38 @@ for my $i (2 .. 9)
$n = $C->_new("2");
my $rc = '9' x ($i-1). '8' . '0' x ($i-1) . '1';
print "# _pow( ", '9' x $i, ", 2) \n" unless
- ok ($C->_str($C->_pow($x,$n)),$rc);
+ is ($C->_str($C->_pow($x,$n)),$rc);
if ($i <= 7)
{
$x = '9' x $i; $x = $C->_new($x);
$n = '9' x $i; $n = $C->_new($n);
print "# _root( ", '9' x $i, ", ", 9 x $i, ") \n" unless
- ok ($C->_str($C->_root($x,$n)),'1');
+ is ($C->_str($C->_root($x,$n)),'1');
$x = '9' x $i; $x = $C->_new($x);
$n = $C->_new("2");
print "# _root( ", '9' x $i, ", ", 9 x $i, ") \n" unless
- ok ($C->_str($C->_root($x,$n)), $res->[$i-2]);
+ is ($C->_str($C->_root($x,$n)), $res->[$i-2]);
}
}
##############################################################################
# _fac
-$x = $C->_new("0"); ok ($C->_str($C->_fac($x)),'1');
-$x = $C->_new("1"); ok ($C->_str($C->_fac($x)),'1');
-$x = $C->_new("2"); ok ($C->_str($C->_fac($x)),'2');
-$x = $C->_new("3"); ok ($C->_str($C->_fac($x)),'6');
-$x = $C->_new("4"); ok ($C->_str($C->_fac($x)),'24');
-$x = $C->_new("5"); ok ($C->_str($C->_fac($x)),'120');
-$x = $C->_new("10"); ok ($C->_str($C->_fac($x)),'3628800');
-$x = $C->_new("11"); ok ($C->_str($C->_fac($x)),'39916800');
-$x = $C->_new("12"); ok ($C->_str($C->_fac($x)),'479001600');
-$x = $C->_new("13"); ok ($C->_str($C->_fac($x)),'6227020800');
+$x = $C->_new("0"); is ($C->_str($C->_fac($x)),'1');
+$x = $C->_new("1"); is ($C->_str($C->_fac($x)),'1');
+$x = $C->_new("2"); is ($C->_str($C->_fac($x)),'2');
+$x = $C->_new("3"); is ($C->_str($C->_fac($x)),'6');
+$x = $C->_new("4"); is ($C->_str($C->_fac($x)),'24');
+$x = $C->_new("5"); is ($C->_str($C->_fac($x)),'120');
+$x = $C->_new("10"); is ($C->_str($C->_fac($x)),'3628800');
+$x = $C->_new("11"); is ($C->_str($C->_fac($x)),'39916800');
+$x = $C->_new("12"); is ($C->_str($C->_fac($x)),'479001600');
+$x = $C->_new("13"); is ($C->_str($C->_fac($x)),'6227020800');
# test that _fac modifes $x in place for small arguments
-$x = $C->_new("3"); $C->_fac($x); ok ($C->_str($x),'6');
-$x = $C->_new("13"); $C->_fac($x); ok ($C->_str($x),'6227020800');
+$x = $C->_new("3"); $C->_fac($x); is ($C->_str($x),'6');
+$x = $C->_new("13"); $C->_fac($x); is ($C->_str($x),'6227020800');
##############################################################################
# _inc and _dec
@@ -320,26 +312,26 @@ foreach (qw/1 11 121 1231 12341 1234561 12345671
123456781 1234567891/)
{
$x = $C->_new("$_"); $C->_inc($x);
print "# \$x = ",$C->_str($x),"\n"
- unless ok ($C->_str($x),substr($_,0,length($_)-1) . '2');
- $C->_dec($x); ok ($C->_str($x),$_);
+ unless is ($C->_str($x),substr($_,0,length($_)-1) . '2');
+ $C->_dec($x); is ($C->_str($x),$_);
}
foreach (qw/19 119 1219 12319 1234519 12345619 123456719 1234567819/)
{
$x = $C->_new("$_"); $C->_inc($x);
print "# \$x = ",$C->_str($x),"\n"
- unless ok ($C->_str($x),substr($_,0,length($_)-2) . '20');
- $C->_dec($x); ok ($C->_str($x),$_);
+ unless is ($C->_str($x),substr($_,0,length($_)-2) . '20');
+ $C->_dec($x); is ($C->_str($x),$_);
}
foreach (qw/999 9999 99999 9999999 99999999 999999999 9999999999 99999999999/)
{
$x = $C->_new("$_"); $C->_inc($x);
print "# \$x = ",$C->_str($x),"\n"
- unless ok ($C->_str($x), '1' . '0' x (length($_)));
- $C->_dec($x); ok ($C->_str($x),$_);
+ unless is ($C->_str($x), '1' . '0' x (length($_)));
+ $C->_dec($x); is ($C->_str($x),$_);
}
-$x = $C->_new("1000"); $C->_inc($x); ok ($C->_str($x),'1001');
-$C->_dec($x); ok ($C->_str($x),'1000');
+$x = $C->_new("1000"); $C->_inc($x); is ($C->_str($x),'1001');
+$C->_dec($x); is ($C->_str($x),'1000');
my $BL;
{
@@ -349,57 +341,57 @@ my $BL;
$x = '1' . '0' x $BL;
$z = '1' . '0' x ($BL-1); $z .= '1';
-$x = $C->_new($x); $C->_inc($x); ok ($C->_str($x),$z);
+$x = $C->_new($x); $C->_inc($x); is ($C->_str($x),$z);
$x = '1' . '0' x $BL; $z = '9' x $BL;
-$x = $C->_new($x); $C->_dec($x); ok ($C->_str($x),$z);
+$x = $C->_new($x); $C->_dec($x); is ($C->_str($x),$z);
# should not happen:
-# $x = $C->_new("-2"); $y = $C->_new("4"); ok ($C->_acmp($x,$y),-1);
+# $x = $C->_new("-2"); $y = $C->_new("4"); is ($C->_acmp($x,$y),-1);
###############################################################################
# _mod
$x = $C->_new("1000"); $y = $C->_new("3");
-ok ($C->_str(scalar $C->_mod($x,$y)),1);
+is ($C->_str(scalar $C->_mod($x,$y)),1);
$x = $C->_new("1000"); $y = $C->_new("2");
-ok ($C->_str(scalar $C->_mod($x,$y)),0);
+is ($C->_str(scalar $C->_mod($x,$y)),0);
# _and, _or, _xor
$x = $C->_new("5"); $y = $C->_new("2");
-ok ($C->_str(scalar $C->_xor($x,$y)),7);
+is ($C->_str(scalar $C->_xor($x,$y)),7);
$x = $C->_new("5"); $y = $C->_new("2");
-ok ($C->_str(scalar $C->_or($x,$y)),7);
+is ($C->_str(scalar $C->_or($x,$y)),7);
$x = $C->_new("5"); $y = $C->_new("3");
-ok ($C->_str(scalar $C->_and($x,$y)),1);
+is ($C->_str(scalar $C->_and($x,$y)),1);
# _from_hex, _from_bin, _from_oct
-ok ($C->_str( $C->_from_hex("0xFf")),255);
-ok ($C->_str( $C->_from_bin("0b10101011")),160+11);
-ok ($C->_str( $C->_from_oct("0100")), 8*8);
-ok ($C->_str( $C->_from_oct("01000")), 8*8*8);
-ok ($C->_str( $C->_from_oct("010001")), 8*8*8*8+1);
-ok ($C->_str( $C->_from_oct("010007")), 8*8*8*8+7);
+is ($C->_str( $C->_from_hex("0xFf")),255);
+is ($C->_str( $C->_from_bin("0b10101011")),160+11);
+is ($C->_str( $C->_from_oct("0100")), 8*8);
+is ($C->_str( $C->_from_oct("01000")), 8*8*8);
+is ($C->_str( $C->_from_oct("010001")), 8*8*8*8+1);
+is ($C->_str( $C->_from_oct("010007")), 8*8*8*8+7);
# _as_hex, _as_bin, as_oct
-ok ($C->_str( $C->_from_hex( $C->_as_hex( $C->_new("128")))), 128);
-ok ($C->_str( $C->_from_bin( $C->_as_bin( $C->_new("128")))), 128);
-ok ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("128")))), 128);
+is ($C->_str( $C->_from_hex( $C->_as_hex( $C->_new("128")))), 128);
+is ($C->_str( $C->_from_bin( $C->_as_bin( $C->_new("128")))), 128);
+is ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("128")))), 128);
-ok ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("123456")))), 123456);
-ok ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("123456789")))),
"123456789");
-ok ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("1234567890123")))),
"1234567890123");
+is ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("123456")))), 123456);
+is ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("123456789")))),
"123456789");
+is ($C->_str( $C->_from_oct( $C->_as_oct( $C->_new("1234567890123")))),
"1234567890123");
# _1ex
-ok ($C->_str($C->_1ex(0)), "1");
-ok ($C->_str($C->_1ex(1)), "10");
-ok ($C->_str($C->_1ex(2)), "100");
-ok ($C->_str($C->_1ex(12)), "1000000000000");
-ok ($C->_str($C->_1ex(16)), "10000000000000000");
+is ($C->_str($C->_1ex(0)), "1");
+is ($C->_str($C->_1ex(1)), "10");
+is ($C->_str($C->_1ex(2)), "100");
+is ($C->_str($C->_1ex(12)), "1000000000000");
+is ($C->_str($C->_1ex(16)), "10000000000000000");
# _check
$x = $C->_new("123456789");
-ok ($C->_check($x),0);
-ok ($C->_check(123),'123 is not a reference');
+is ($C->_check($x),0);
+is ($C->_check(123),'123 is not a reference');
###############################################################################
# __strip_zeros
@@ -407,29 +399,29 @@ ok ($C->_check(123),'123 is not a reference');
{
no strict 'refs';
# correct empty arrays
- $x = &{$C."::__strip_zeros"}([]); ok (@$x,1); ok ($x->[0],0);
+ $x = &{$C."::__strip_zeros"}([]); is (@$x,1); is ($x->[0],0);
# don't strip single elements
- $x = &{$C."::__strip_zeros"}([0]); ok (@$x,1); ok ($x->[0],0);
- $x = &{$C."::__strip_zeros"}([1]); ok (@$x,1); ok ($x->[0],1);
+ $x = &{$C."::__strip_zeros"}([0]); is (@$x,1); is ($x->[0],0);
+ $x = &{$C."::__strip_zeros"}([1]); is (@$x,1); is ($x->[0],1);
# don't strip non-zero elements
$x = &{$C."::__strip_zeros"}([0,1]);
- ok (@$x,2); ok ($x->[0],0); ok ($x->[1],1);
+ is (@$x,2); is ($x->[0],0); is ($x->[1],1);
$x = &{$C."::__strip_zeros"}([0,1,2]);
- ok (@$x,3); ok ($x->[0],0); ok ($x->[1],1); ok ($x->[2],2);
+ is (@$x,3); is ($x->[0],0); is ($x->[1],1); is ($x->[2],2);
# but strip leading zeros
$x = &{$C."::__strip_zeros"}([0,1,2,0]);
- ok (@$x,3); ok ($x->[0],0); ok ($x->[1],1); ok ($x->[2],2);
+ is (@$x,3); is ($x->[0],0); is ($x->[1],1); is ($x->[2],2);
$x = &{$C."::__strip_zeros"}([0,1,2,0,0]);
- ok (@$x,3); ok ($x->[0],0); ok ($x->[1],1); ok ($x->[2],2);
+ is (@$x,3); is ($x->[0],0); is ($x->[1],1); is ($x->[2],2);
$x = &{$C."::__strip_zeros"}([0,1,2,0,0,0]);
- ok (@$x,3); ok ($x->[0],0); ok ($x->[1],1); ok ($x->[2],2);
+ is (@$x,3); is ($x->[0],0); is ($x->[1],1); is ($x->[2],2);
# collapse multiple zeros
$x = &{$C."::__strip_zeros"}([0,0,0,0]);
- ok (@$x,1); ok ($x->[0],0);
+ is (@$x,1); is ($x->[0],0);
}
# done
diff --git a/dist/Math-BigInt-FastCalc/t/bootstrap.t
b/dist/Math-BigInt-FastCalc/t/bootstrap.t
index 6b61044..d73afcb 100644
--- a/dist/Math-BigInt-FastCalc/t/bootstrap.t
+++ b/dist/Math-BigInt-FastCalc/t/bootstrap.t
@@ -1,16 +1,8 @@
#!/usr/bin/perl -w
-use Test;
-BEGIN
- {
- $| = 1;
- unshift @INC, '../blib/lib';
- unshift @INC, '../blib/arch';
- unshift @INC, '../lib';
- plan tests => 1;
- };
+use Test::More tests => 1;
-use Math::BigInt::FastCalc;
-
-ok(1); # could load it?
+BEGIN {
+ use_ok('Math::BigInt::FastCalc');
+}
diff --git a/dist/Math-BigInt-FastCalc/t/leak.t
b/dist/Math-BigInt-FastCalc/t/leak.t
index 6120c9f..1da619f 100644
--- a/dist/Math-BigInt-FastCalc/t/leak.t
+++ b/dist/Math-BigInt-FastCalc/t/leak.t
@@ -5,15 +5,8 @@
# XXX TODO: This test file doesn't actually seem to work! If you remove
# the sv_2mortal() in the XS file, it still happily passes all tests...
-use Test::More;
use strict;
-
-BEGIN
- {
- $| = 1;
- unshift @INC, ('../lib', '../blib/arch'); # for running manually
- plan tests => 22;
- }
+use Test::More tests => 22;
use Math::BigInt::FastCalc;
diff --git a/dist/Math-BigInt-FastCalc/t/mbi_rand.t
b/dist/Math-BigInt-FastCalc/t/mbi_rand.t
index 339efae..4ad473d 100644
--- a/dist/Math-BigInt-FastCalc/t/mbi_rand.t
+++ b/dist/Math-BigInt-FastCalc/t/mbi_rand.t
@@ -1,21 +1,12 @@
#!/usr/bin/perl -w
-use Test::More;
use strict;
+use Test::More;
-my $count;
-
-BEGIN
- {
- $| = 1;
- if ($^O eq 'os390') { print "1..0\n"; exit(0) } # test takes too long there
- unshift @INC, '../lib'; # for running manually
- unshift @INC, '../blib/arch';
- my $location = $0; $location =~ s/mbi_rand.t//;
- unshift @INC, $location; # to locate the testing files
- $count = 128;
- plan tests => $count*2;
- }
+my $count = 128;
+
+plan(($^O eq 'os390')
+ ? (skip_all => 'takes too long on os390') : (tests => $count*2));
use Math::BigInt lib => 'FastCalc';
my $c = 'Math::BigInt';
--
Perl5 Master Repository
