Bugzilla – Attachment 90224 Details for
Bug 22563
Convert lost handling to use 'status' instead of multiple accounttypes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22563: (follow-up) Corrections for tests
Bug-22563-follow-up-Corrections-for-tests.patch (text/plain), 12.91 KB, created by
Kyle M Hall (khall)
on 2019-05-31 11:06:11 UTC
(
hide
)
Description:
Bug 22563: (follow-up) Corrections for tests
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2019-05-31 11:06:11 UTC
Size:
12.91 KB
patch
obsolete
>From cf5e3dbef0864c7ac34d8ec574ab0712479da7b5 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 27 Mar 2019 14:56:52 +0000 >Subject: [PATCH] Bug 22563: (follow-up) Corrections for tests > >Updates to unit tests to reflect the accounttype changes and >introduction of status usage. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > t/db_dependent/Circulation.t | 67 ++++++++++--------- > .../Circulation/NoIssuesChargeGuarantees.t | 2 +- > 2 files changed, 38 insertions(+), 31 deletions(-) > >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index 9d13e57969..7f7e83c960 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -2087,7 +2087,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > > subtest 'Full write-off tests' => sub { > >- plan tests => 10; >+ plan tests => 12; > > my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); > my $manager = $builder->build_object({ class => "Koha::Patrons" }); >@@ -2121,9 +2121,11 @@ subtest '_FixAccountForLostAndReturned' => sub { > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'LOST' } ); > is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' ); > my $lost_fee_line = $lost_fee_lines->next; >- is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' ); >+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right LOST amount is generated' ); > is( $lost_fee_line->amountoutstanding + 0, >- $replacement_amount, 'The right L amountoutstanding is generated' ); >+ $replacement_amount, 'The right LOST amountoutstanding is generated' ); >+ is( $lost_fee_line->status, >+ undef, 'The LOST status was not set' ); > > my $account = $patron->account; > my $debts = $account->outstanding_debits; >@@ -2138,19 +2140,20 @@ subtest '_FixAccountForLostAndReturned' => sub { > $credit->apply( { debits => $debts, offset_type => 'Writeoff' } ); > > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id ); >- is( $credit_return_id, undef, 'No CR account line added' ); >+ is( $credit_return_id, undef, 'No LOST_RETURN account line added' ); > > $lost_fee_line->discard_changes; # reload from DB > is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' ); > is( $lost_fee_line->accounttype, >- 'LR', 'Lost fee now has account type of LR ( Lost Returned )' ); >+ 'LOST', 'Lost fee now still has account type of LOST' ); >+ is( $lost_fee_line->status, 'RETURNED', "Lost fee now has account status of RETURNED"); > > is( $patron->account->balance, -0, 'The patron balance is 0, everything was written off' ); > }; > > subtest 'Full payment tests' => sub { > >- plan tests => 12; >+ plan tests => 13; > > my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); > >@@ -2182,9 +2185,9 @@ subtest '_FixAccountForLostAndReturned' => sub { > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'LOST' } ); > is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' ); > my $lost_fee_line = $lost_fee_lines->next; >- is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' ); >+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right LOST amount is generated' ); > is( $lost_fee_line->amountoutstanding + 0, >- $replacement_amount, 'The right L amountountstanding is generated' ); >+ $replacement_amount, 'The right LOST amountountstanding is generated' ); > > my $account = $patron->account; > my $debts = $account->outstanding_debits; >@@ -2201,16 +2204,17 @@ subtest '_FixAccountForLostAndReturned' => sub { > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' ); >+ is( $credit_return->accounttype, 'LOST_RETURN', 'An account line of type LOST_RETURN is added' ); > is( $credit_return->amount + 0, >- -99.00, 'The account line of type CR has an amount of -99' ); >+ -99.00, 'The account line of type LOST_RETURN has an amount of -99' ); > is( $credit_return->amountoutstanding + 0, >- -99.00, 'The account line of type CR has an amountoutstanding of -99' ); >+ -99.00, 'The account line of type LOST_RETURN has an amountoutstanding of -99' ); > > $lost_fee_line->discard_changes; > is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' ); > is( $lost_fee_line->accounttype, >- 'LR', 'Lost fee now has account type of LR ( Lost Returned )' ); >+ 'LOST', 'Lost fee now still has account type of LOST' ); >+ is( $lost_fee_line->status, 'RETURNED', "Lost fee now has account status of RETURNED"); > > is( $patron->account->balance, > -99, 'The patron balance is -99, a credit that equals the lost fee payment' ); >@@ -2218,7 +2222,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > > subtest 'Test without payment or write off' => sub { > >- plan tests => 12; >+ plan tests => 13; > > my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); > >@@ -2251,27 +2255,29 @@ subtest '_FixAccountForLostAndReturned' => sub { > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'LOST' } ); > is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' ); > my $lost_fee_line = $lost_fee_lines->next; >- is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' ); >+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right LOST amount is generated' ); > is( $lost_fee_line->amountoutstanding + 0, >- $replacement_amount, 'The right L amountountstanding is generated' ); >+ $replacement_amount, 'The right LOST amountountstanding is generated' ); > > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' ); >- is( $credit_return->amount + 0, -99.00, 'The account line of type CR has an amount of -99' ); >- is( $credit_return->amountoutstanding + 0, 0, 'The account line of type CR has an amountoutstanding of 0' ); >+ is( $credit_return->accounttype, 'LOST_RETURN', 'An account line of type LOST_RETURN is added' ); >+ is( $credit_return->amount + 0, -99.00, 'The account line of type LOST_RETURN has an amount of -99' ); >+ is( $credit_return->amountoutstanding + 0, 0, 'The account line of type LOST_RETURN has an amountoutstanding of 0' ); > > $lost_fee_line->discard_changes; > is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' ); >- is( $lost_fee_line->accounttype, 'LR', 'Lost fee now has account type of LR ( Lost Returned )' ); >+ is( $lost_fee_line->accounttype, >+ 'LOST', 'Lost fee now still has account type of LOST' ); >+ is( $lost_fee_line->status, 'RETURNED', "Lost fee now has account status of RETURNED"); > > is( $patron->account->balance, 20, 'The patron balance is 20, still owes the processing fee' ); > }; > > subtest 'Test with partial payement and write off, and remaining debt' => sub { > >- plan tests => 15; >+ plan tests => 16; > > my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); > my $item = $builder->build_sample_item( >@@ -2302,9 +2308,9 @@ subtest '_FixAccountForLostAndReturned' => sub { > { borrowernumber => $patron->id, itemnumber => $item->itemnumber, accounttype => 'LOST' } ); > is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' ); > my $lost_fee_line = $lost_fee_lines->next; >- is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' ); >+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right LOST amount is generated' ); > is( $lost_fee_line->amountoutstanding + 0, >- $replacement_amount, 'The right L amountountstanding is generated' ); >+ $replacement_amount, 'The right LOST amountountstanding is generated' ); > > my $account = $patron->account; > is( $account->balance, $processfee_amount + $replacement_amount, 'Balance is PF + L' ); >@@ -2342,21 +2348,22 @@ subtest '_FixAccountForLostAndReturned' => sub { > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item->itemnumber, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (CR)' ); >+ is( $account->balance, $processfee_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' ); > > $lost_fee_line->discard_changes; > is( $lost_fee_line->amountoutstanding + 0, 0, 'Lost fee has no outstanding amount' ); > is( $lost_fee_line->accounttype, >- 'LR', 'Lost fee now has account type of LR ( Lost Returned )' ); >+ 'LOST', 'Lost fee now still has account type of LOST' ); >+ is( $lost_fee_line->status, 'RETURNED', "Lost fee now has account status of RETURNED"); > >- is( $credit_return->accounttype, 'CR', 'An account line of type CR is added' ); >+ is( $credit_return->accounttype, 'LOST_RETURN', 'An account line of type LOST_RETURN is added' ); > is( $credit_return->amount + 0, > ($payment_amount + $outstanding ) * -1, >- 'The account line of type CR has an amount equal to the payment + outstanding' >+ 'The account line of type LOST_RETURN has an amount equal to the payment + outstanding' > ); > is( $credit_return->amountoutstanding + 0, > $payment_amount * -1, >- 'The account line of type CR has an amountoutstanding equal to the payment' >+ 'The account line of type LOST_RETURN has an amountoutstanding equal to the payment' > ); > > is( $account->balance, >@@ -2405,9 +2412,9 @@ subtest '_FixAccountForLostAndReturned' => sub { > { borrowernumber => $patron->id, itemnumber => $item_id, accounttype => 'LOST' } ); > is( $lost_fee_lines->count, 1, 'Only one lost item fee produced' ); > my $lost_fee_line = $lost_fee_lines->next; >- is( $lost_fee_line->amount + 0, $replacement_amount, 'The right L amount is generated' ); >+ is( $lost_fee_line->amount + 0, $replacement_amount, 'The right LOST amount is generated' ); > is( $lost_fee_line->amountoutstanding + 0, >- $replacement_amount, 'The right L amountountstanding is generated' ); >+ $replacement_amount, 'The right LOST amountountstanding is generated' ); > > my $account = $patron->account; > is( $account->balance, $replacement_amount, 'Balance is L' ); >@@ -2437,7 +2444,7 @@ subtest '_FixAccountForLostAndReturned' => sub { > my $credit_return_id = C4::Circulation::_FixAccountForLostAndReturned( $item_id, $patron->id ); > my $credit_return = Koha::Account::Lines->find($credit_return_id); > >- is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (CR)' ); >+ is( $account->balance, $manual_debit_amount - $payment_amount, 'Balance is PF - payment (LOST_RETURN)' ); > > my $manual_debit = Koha::Account::Lines->search({ borrowernumber => $patron->id, accounttype => 'OVERDUE', status => 'UNRETURNED' })->next; > is( $manual_debit->amountoutstanding + 0, $manual_debit_amount - $payment_amount, 'reconcile_balance was called' ); >diff --git a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t >index b0ba95193a..df2a407c42 100644 >--- a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t >+++ b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t >@@ -75,7 +75,7 @@ is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check > > my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->{borrowernumber} })->next(); > is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" ); >-is( $accountline->accounttype, "L", "Account type is L" ); >+is( $accountline->accounttype, "LOST", "Account type is LOST" ); > > my $offset = Koha::Account::Offsets->search({ debit_id => $accountline->id })->next(); > is( $offset->type, 'Lost Item', 'Got correct offset type' ); >-- >2.20.1 (Apple Git-117)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=90224">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22563
:
86913
|
86914
|
87092
|
87093
|
87094
|
87637
|
87638
|
87639
|
87640
|
87641
|
87642
|
87801
|
87802
|
87803
|
87804
|
87805
|
87806
|
88279
|
88280
|
88281
|
88282
|
88283
|
88284
|
88285
|
88323
|
88324
|
88325
|
88326
|
88327
|
88328
|
88720
|
88721
|
88722
|
88723
|
88724
|
88725
|
89462
|
89463
|
89464
|
89465
|
89466
|
89467
|
90221
|
90222
|
90223
|
90224
|
90225
|
90226
|
90227
|
90307
|
90308
|
90309
|
90310
|
90311
|
90312
|
90330
|
90331
|
90332
|
90333
|
90334
|
90335
|
90632
|
90637
|
90667
|
91338
|
91339
|
91340
|
91341
|
91342
|
91343
|
91344
|
91345
|
91346
|
91347
|
91348