Bug 17196: follow-up for bug 17088

[koha.git] / t / Members / cardnumber.t

diff --git a/t/Members/cardnumber.t b/t/Members/cardnumber.t
index deb76de..af3a4bb 100644 (file)
--- a/t/Members/cardnumber.t
+++ b/t/Members/cardnumber.t
@@ -5,6 +5,7 @@ use Test::More tests => 25;
 
 use t::lib::Mocks;
 
+use Koha::Schema;
 use_ok('C4::Members');
 
 BEGIN {
@@ -14,6 +15,9 @@ BEGIN {
 my $dbh = C4::Context->dbh;
 my $rs = [];
 
+my $borrower = Koha::Schema->resultset('Borrower');
+my $cardnumber_size = $borrower->result_source->column_info('cardnumber')->{size};
+
 t::lib::Mocks::mock_preference('BorrowerMandatoryField', '');
 my $pref = "10";
 t::lib::Mocks::mock_preference('CardnumberLength', $pref);
@@ -49,7 +53,7 @@ is( C4::Members::checkcardnumber( q{1234567890} ), 0, "1234567890 matches $pref"
 
 $pref = q|8,|; # At least 8 chars
 t::lib::Mocks::mock_preference('CardnumberLength', $pref);
-is_deeply( [ C4::Members::get_cardnumber_length() ], [ 8, 16 ], '8, => min=8 and max=16');
+is_deeply( [ C4::Members::get_cardnumber_length() ], [ 8, $cardnumber_size ], "8, => min=8 and max=$cardnumber_size");
 $dbh->{mock_add_resultset} = $rs;
 is( C4::Members::checkcardnumber( q{1234567} ), 2, "1234567 is shorter than $pref");
 $dbh->{mock_add_resultset} = $rs;
@@ -67,11 +71,14 @@ is( C4::Members::checkcardnumber( q{1234567890123456} ), 2, "1234567890123456 is
 $dbh->{mock_add_resultset} = $rs;
 is( C4::Members::checkcardnumber( q{1234567890} ), 2, "1234567890 is longer than $pref");
 
-$pref = q|,40|; # max 40 chars, not allowed
+$pref = sprintf(',%d', $cardnumber_size+1);
 t::lib::Mocks::mock_preference('CardnumberLength', $pref);
-is_deeply( [ C4::Members::get_cardnumber_length() ], [ 0, 16 ], ',40 => min=0 and max=16');
+is_deeply( [ C4::Members::get_cardnumber_length() ], [ 0, $cardnumber_size ],
+    sprintf(",%d => min=0 and max=%d",$cardnumber_size+1,$cardnumber_size) );
 $dbh->{mock_add_resultset} = $rs;
-is( C4::Members::checkcardnumber( q{12345678901234567890} ), 2, "12345678901234567890 is longer than $pref => 16 is max!");
+
+my $generated_cardnumber = sprintf("%s1234567890",q|9|x$cardnumber_size);
+is( C4::Members::checkcardnumber( $generated_cardnumber ), 2, "$generated_cardnumber is longer than $pref => $cardnumber_size is max!");
 
 $pref = q|,8|; # max 8 chars
 t::lib::Mocks::mock_preference('CardnumberLength', $pref);