Bug 17600: Standardize our EXPORT_OK

[srvgit] / t / db_dependent / Acquisition / TransferOrder.t

diff --git a/t/db_dependent/Acquisition/TransferOrder.t b/t/db_dependent/Acquisition/TransferOrder.t
old mode 100644 (file)
new mode 100755 (executable)
index 646e770..a9e59a5
--- a/t/db_dependent/Acquisition/TransferOrder.t
+++ b/t/db_dependent/Acquisition/TransferOrder.t
@@ -2,48 +2,48 @@
 
 use Modern::Perl;
 
-use Test::More tests => 11;
+use Test::More tests => 13;
 use C4::Context;
-use C4::Acquisition;
+use C4::Acquisition qw( NewBasket GetOrders GetOrder TransferOrder SearchOrders ModReceiveOrder CancelReceipt );
 use C4::Biblio;
 use C4::Items;
-use C4::Bookseller;
-use C4::Budgets;
+use C4::Budgets qw( AddBudget GetBudget );
 use Koha::Database;
 use Koha::DateUtils;
-use Koha::Acquisition::Order;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use t::lib::TestBuilder;
 use MARC::Record;
 
 my $schema = Koha::Database->new()->schema();
 $schema->storage->txn_begin();
 
-my $dbh = C4::Context->dbh;
-$dbh->{RaiseError} = 1;
+my $builder = t::lib::TestBuilder->new;
 
-my $booksellerid1 = C4::Bookseller::AddBookseller(
+my $bookseller1 = Koha::Acquisition::Bookseller->new(
     {
         name => "my vendor 1",
         address1 => "bookseller's address",
         phone => "0123456",
         active => 1
     }
-);
+)->store;
 
 my $basketno1 = C4::Acquisition::NewBasket(
-    $booksellerid1
+    $bookseller1->id
 );
 
-my $booksellerid2 = C4::Bookseller::AddBookseller(
+my $bookseller2 = Koha::Acquisition::Bookseller->new(
     {
         name => "my vendor 2",
         address1 => "bookseller's address",
         phone => "0123456",
         active => 1
     }
-);
+)->store;
 
 my $basketno2 = C4::Acquisition::NewBasket(
-    $booksellerid2
+    $bookseller2->id
 );
 
 my $budgetid = C4::Budgets::AddBudget(
@@ -55,8 +55,9 @@ my $budgetid = C4::Budgets::AddBudget(
 
 my $budget = C4::Budgets::GetBudget( $budgetid );
 
-my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, '');
-my $itemnumber = AddItem({}, $biblionumber);
+my $biblio = $builder->build_sample_biblio();
+my $item_1 = $builder->build_sample_item({ biblionumber => $biblio->biblionumber });
+my $biblionumber = $biblio->biblionumber;
 
 my $order = Koha::Acquisition::Order->new(
     {
@@ -65,22 +66,30 @@ my $order = Koha::Acquisition::Order->new(
         biblionumber => $biblionumber,
         budget_id => $budget->{budget_id},
     }
-)->insert;
-my $ordernumber = $order->{ordernumber};
-$order->add_item( $itemnumber );
+)->store;
+my $ordernumber = $order->ordernumber;
+$order->add_item( $item_1->itemnumber );
 
 # Begin tests
 is(scalar GetOrders($basketno1), 1, "1 order in basket1");
 ($order) = GetOrders($basketno1);
-is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket1's order");
+$order = Koha::Acquisition::Orders->find($order->{ordernumber});
+is($order->items->count, 1, "1 item in basket1's order");
 is(scalar GetOrders($basketno2), 0, "0 order in basket2");
 
 # Transfering order to basket2
 my $newordernumber = TransferOrder($ordernumber, $basketno2);
 is(scalar GetOrders($basketno1), 0, "0 order in basket1");
 is(scalar GetOrders($basketno2), 1, "1 order in basket2");
+
+# Determine if the transfer marked things cancelled properly.
+is($order->orderstatus,'new','Before the transfer, the order status should be new');
+$order = Koha::Acquisition::Orders->find($order->ordernumber);
+is($order->orderstatus,'cancelled','After the transfer, the order status should be set to cancelled');
+
 ($order) = GetOrders($basketno2);
-is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket2's order");
+$order = Koha::Acquisition::Orders->find($order->{ordernumber});
+is($order->items->count, 1, "1 item in basket2's order");
 
 # Bug 11552
 my $orders = SearchOrders({ ordernumber => $newordernumber });
@@ -89,11 +98,12 @@ $orders = SearchOrders({ ordernumber => $ordernumber });
 is ( scalar( @$orders ), 1, 'SearchOrders returns 1 order with [old]ordernumber' );
 is ( $orders->[0]->{ordernumber}, $newordernumber, 'SearchOrders returns newordernumber if [old]ordernumber is given' );
 
+my $neworder = Koha::Acquisition::Orders->find( $newordernumber )->unblessed;
+
 ModReceiveOrder({
     biblionumber => $biblionumber,
-    ordernumber => $newordernumber,
+    order       => $neworder,
     quantityreceived => 2, 
-    datereceived => dt_from_string(),
 });
 CancelReceipt( $newordernumber );
 $order = GetOrder( $newordernumber );