Bug 15899 - Fix up unit tests

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/t/db_dependent/Accounts.t b/t/db_dependent/Accounts.t
index f78882a..afbe8e9 100644 (file)
--- a/t/db_dependent/Accounts.t
+++ b/t/db_dependent/Accounts.t
@@ -35,7 +35,7 @@ BEGIN {
 }
 
 can_ok( 'C4::Accounts',
-    qw( recordpayment
+    qw(
         makepayment
         getnextacctno
         chargelostitem
@@ -136,7 +136,7 @@ for my $data  (@test_data) {
 
 $dbh->do(q|DELETE FROM accountlines|);
 
-subtest "recordpayment() tests" => sub {
+subtest "Koha::Account::pay tests" => sub {
 
     plan tests => 10;
 
@@ -153,6 +153,8 @@ subtest "recordpayment() tests" => sub {
     $borrower->branchcode( $branchcode );
     $borrower->store;
 
+    my $account = Koha::Account->new({ patron_id => $borrower->id });
+
     my $line1 = Koha::Account::Line->new({ borrowernumber => $borrower->borrowernumber, amountoutstanding => 100 })->store();
     my $line2 = Koha::Account::Line->new({ borrowernumber => $borrower->borrowernumber, amountoutstanding => 200 })->store();
 
@@ -161,7 +163,6 @@ subtest "recordpayment() tests" => sub {
     my $count = $sth->fetchrow_array;
     is($count, 2, 'There is 2 lines as expected');
 
-    # Testing recordpayment -------------------------
     # There is $100 in the account
     $sth = $dbh->prepare("SELECT amountoutstanding FROM accountlines WHERE borrowernumber=?");
     my $amountoutstanding = $dbh->selectcol_arrayref($sth, {}, $borrower->borrowernumber);
@@ -174,9 +175,9 @@ subtest "recordpayment() tests" => sub {
     # We make a $20 payment
     my $borrowernumber = $borrower->borrowernumber;
     my $data = '20.00';
-    my $sys_paytype;
     my $payment_note = '$20.00 payment note';
-    recordpayment($borrowernumber, $data, $sys_paytype, $payment_note);
+    $account->pay( { amount => $data, note => $payment_note } );
+
     # There is now $280 in the account
     $sth = $dbh->prepare("SELECT amountoutstanding FROM accountlines WHERE borrowernumber=?");
     $amountoutstanding = $dbh->selectcol_arrayref($sth, {}, $borrower->borrowernumber);
@@ -185,6 +186,7 @@ subtest "recordpayment() tests" => sub {
         $amountleft += $line;
     }
     is($amountleft, 280, 'The account has $280 as expected' );
+
     # Is the payment note well registered
     $sth = $dbh->prepare("SELECT note FROM accountlines WHERE borrowernumber=? ORDER BY accountlines_id DESC LIMIT 1");
     $sth->execute($borrower->borrowernumber);
@@ -194,7 +196,8 @@ subtest "recordpayment() tests" => sub {
     # We make a -$30 payment (a NEGATIVE payment)
     $data = '-30.00';
     $payment_note = '-$30.00 payment note';
-    recordpayment($borrowernumber, $data, $sys_paytype, $payment_note);
+    $account->pay( { amount => $data, note => $payment_note } );
+
     # There is now $310 in the account
     $sth = $dbh->prepare("SELECT amountoutstanding FROM accountlines WHERE borrowernumber=?");
     $amountoutstanding = $dbh->selectcol_arrayref($sth, {}, $borrower->borrowernumber);
@@ -212,7 +215,8 @@ subtest "recordpayment() tests" => sub {
     #We make a $150 payment ( > 1stLine )
     $data = '150.00';
     $payment_note = '$150.00 payment note';
-    recordpayment($borrowernumber, $data, $sys_paytype, $payment_note);
+    $account->pay( { amount => $data, note => $payment_note } );
+
     # There is now $160 in the account
     $sth = $dbh->prepare("SELECT amountoutstanding FROM accountlines WHERE borrowernumber=?");
     $amountoutstanding = $dbh->selectcol_arrayref($sth, {}, $borrower->borrowernumber);
@@ -230,7 +234,8 @@ subtest "recordpayment() tests" => sub {
     #We make a $200 payment ( > amountleft )
     $data = '200.00';
     $payment_note = '$200.00 payment note';
-    recordpayment($borrowernumber, $data, $sys_paytype, $payment_note);
+    $account->pay( { amount => $data, note => $payment_note } );
+
     # There is now -$40 in the account
     $sth = $dbh->prepare("SELECT amountoutstanding FROM accountlines WHERE borrowernumber=?");
     $amountoutstanding = $dbh->selectcol_arrayref($sth, {}, $borrower->borrowernumber);