Bugzilla – Attachment 79304 Details for
Bug 21385
Vendor search: Item count is incorrectly updated on partial receive
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21385: Add Unit Tests
Bug-21385-Add-Unit-Tests.patch (text/plain), 6.37 KB, created by
Martin Renvoize (ashimema)
on 2018-09-24 12:35:59 UTC
(
hide
)
Description:
Bug 21385: Add Unit Tests
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-09-24 12:35:59 UTC
Size:
6.37 KB
patch
obsolete
>From 197bad3349577fdf7a94bb4462e8dc282521d79f Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 24 Sep 2018 13:23:25 +0100 >Subject: [PATCH] Bug 21385: Add Unit Tests > >--- > .../Acquisition/GetBasketsInfosByBookseller.t | 73 ++++++++++++++++++- > 1 file changed, 70 insertions(+), 3 deletions(-) > >diff --git a/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t b/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t >index 20bcb0b59f..6ef8d2b2f6 100644 >--- a/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t >+++ b/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t >@@ -1,7 +1,7 @@ > #!/usr/bin/perl > > use Modern::Perl; >-use Test::More tests => 18; >+use Test::More tests => 40; > use Data::Dumper; > > use C4::Acquisition qw( NewBasket GetBasketsInfosByBookseller ); >@@ -69,6 +69,7 @@ my $basket = $baskets->[0]; > is( $basket->{total_items}, 6, 'Start with 6 items' ); > is( $basket->{total_biblios}, 2, 'Start with 2 biblios' ); > is( $basket->{total_items_cancelled}, 0, 'Start with 0 item cancelled' ); >+is( $basket->{expected_items}, 6, 'Start with 6 items expected' ); > is( $basket->{total_biblios_cancelled}, 0, 'Start with 0 biblio cancelled' ); > > C4::Acquisition::DelOrder( $biblionumber2, $ordernumber2 ); >@@ -78,15 +79,17 @@ $basket = $baskets->[0]; > is( $basket->{total_items}, 6, 'Order2 deleted, still 6 items' ); > is( $basket->{total_biblios}, 2, 'Order2 deleted, still 2 biblios' ); > is( $basket->{total_items_cancelled}, 4, 'Order2 deleted, 4 items cancelled' ); >-is( $basket->{total_biblios_cancelled}, 1, 'Order2 deleted, 2 biblios cancelled' ); >+is( $basket->{expected_items}, 2, 'Order2 deleted, now 2 items are expected' ); >+is( $basket->{total_biblios_cancelled}, 1, 'Order2 deleted, 1 biblios cancelled' ); > > C4::Acquisition::DelOrder( $biblionumber1, $ordernumber1 ); > $baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid ); > is( scalar(@$baskets), 1, 'Both orders deleted, still 1 basket' ); > $basket = $baskets->[0]; > is( $basket->{total_items}, 6, 'Both orders deleted, still 6 items' ); >-is( $basket->{total_biblios}, 2, 'Both orders deleted, still 6 biblios' ); >+is( $basket->{total_biblios}, 2, 'Both orders deleted, still 2 biblios' ); > is( $basket->{total_items_cancelled}, 6, 'Both orders deleted, 6 items cancelled' ); >+is( $basket->{expected_items}, 0, 'Both orders delete, now 0 items are expected' ); > is( $basket->{total_biblios_cancelled}, 2, 'Both orders deleted, 2 biblios cancelled' ); > > C4::Acquisition::CloseBasket( $basketno ); >@@ -95,5 +98,69 @@ is( scalar(@$baskets), 0, 'Basket is closed, 0 basket opened' ); > $baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid, 1 ); > is( scalar(@$baskets), 1, 'Basket is closed, test allbasket parameter'); > >+C4::Acquisition::ReopenBasket( $basketno ); >+my $order3 = Koha::Acquisition::Order->new( >+ { >+ basketno => $basketno, >+ quantity => 4, >+ biblionumber => $biblionumber3, >+ budget_id => $budget->{budget_id}, >+ } >+)->store; >+my $ordernumber3 = $order3->ordernumber; >+ >+C4::Acquisition::CloseBasket( $basketno ); >+$baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid ); >+is( scalar(@$baskets), 1, 'Basket is closed and has items to recieve' ); >+$basket = $baskets->[0]; >+is( $basket->{total_items}, 10, '2 orders deleted, 1 order pending, 10 items total' ); >+is( $basket->{total_biblios}, 3, '2 orders deleted, 1 order pending, 3 biblios total' ); >+is( $basket->{total_items_cancelled}, 6, '2 orders deleted, 1 order pending, still 6 items cancelled' ); >+is( $basket->{expected_items}, 4, '2 orders delete, 1 order pending, 4 items are expected' ); >+is( $basket->{total_biblios_cancelled}, 2, '2 orders deleted, 1 order pending, still 2 biblios cancelled' ); >+ >+my $invoiceid1 = C4::Acquisition::AddInvoice(invoicenumber => 'invoice1', booksellerid => $supplierid, unknown => "unknown"); >+my $invoice1 = C4::Acquisition::GetInvoice( $invoiceid1 ); >+my ( $date_received, $ordernumber4 ) = C4::Acquisition::ModReceiveOrder( >+ { >+ biblionumber => $biblionumber3, >+ order => $order3->unblessed, >+ quantityreceived => 2, >+ budget_id => $budget->{budget_id}, >+ invoice => $invoice1, >+ } >+); >+$baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid ); >+is( scalar(@$baskets), 1, 'Basket is closed and still has items to recieve' ); >+$basket = $baskets->[0]; >+is( $basket->{total_items}, 10, '2 orders deleted, 1 order pending, 10 items total' ); >+is( $basket->{total_biblios}, 3, '2 orders deleted, 1 order pending, 3 biblios total' ); >+is( $basket->{total_items_cancelled}, 6, '2 orders deleted, 1 order pending, still 6 items cancelled' ); >+is( $basket->{expected_items}, 2, '2 orders delete, 1 order pending, 2 items are expected' ); >+is( $basket->{total_biblios_cancelled}, 2, '2 orders deleted, 1 order pending, still 2 biblios cancelled' ); >+ >+my $invoiceid2 = C4::Acquisition::AddInvoice(invoicenumber => 'invoice1', booksellerid => $supplierid, unknown => "unknown"); >+my $invoice2 = C4::Acquisition::GetInvoice( $invoiceid2 ); >+my $order4 = Koha::Acquisition::Orders->find($ordernumber4); >+my ( $date_received2, $ordernumber5 ) = C4::Acquisition::ModReceiveOrder( >+ { >+ biblionumber => $biblionumber3, >+ order => $order4->unblessed, >+ quantityreceived => 2, >+ budget_id => $budget->{budget_id}, >+ invoice => $invoice2, >+ } >+); >+$baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid, 1 ); >+is( scalar(@$baskets), 1, 'Basket is closed and has no items to recieve, test allbasket parameter'); >+$basket = $baskets->[0]; >+is( $basket->{total_items}, 10, 'Basket is closed and has no items to recieve, still 10 items total' ); >+is( $basket->{total_biblios}, 3, 'Basket is closed and has no items to recieve, still 3 biblios total' ); >+is( $basket->{total_items_cancelled}, 6, 'Basket is closed and has no items to recieve, still 6 items cancelled' ); >+is( $basket->{expected_items}, 0, 'Basket is closed and has no items to recieve, 0 items are expected' ); >+is( $basket->{total_biblios_cancelled}, 2, 'Basket is closed and has no items to recieve, still 2 biblios cancelled' ); >+ >+$baskets = C4::Acquisition::GetBasketsInfosByBookseller( $supplierid ); >+is( scalar(@$baskets), 0, 'Basket is closed and has no items to recieve' ); > > $schema->storage->txn_rollback(); >-- >2.18.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21385
:
79235
|
79280
|
79301
|
79303
|
79304
|
79305
|
79362
|
79363
|
79364
|
79365
|
79721
|
79727
|
79728
|
79729
|
79730