Bug 13726: Make Koha::Acq::Bookseller using Koha::Object

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

diff --git a/t/db_dependent/Acquisition/TransferOrder.t b/t/db_dependent/Acquisition/TransferOrder.t
index a608627..a25d2a2 100644 (file)
--- a/t/db_dependent/Acquisition/TransferOrder.t
+++ b/t/db_dependent/Acquisition/TransferOrder.t
@@ -2,44 +2,48 @@
 
 use Modern::Perl;
 
-use Test::More tests => 8;
+use Test::More tests => 13;
 use C4::Context;
 use C4::Acquisition;
 use C4::Biblio;
 use C4::Items;
-use C4::Bookseller;
 use C4::Budgets;
+use Koha::Database;
 use Koha::DateUtils;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Order;
 use MARC::Record;
 
+my $schema = Koha::Database->new()->schema();
+$schema->storage->txn_begin();
+
 my $dbh = C4::Context->dbh;
 $dbh->{RaiseError} = 1;
-$dbh->{AutoCommit} = 0;
 
-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(
@@ -54,34 +58,53 @@ my $budget = C4::Budgets::GetBudget( $budgetid );
 my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, '');
 my $itemnumber = AddItem({}, $biblionumber);
 
-my ( undef, $ordernumber ) = C4::Acquisition::NewOrder(
+my $order = Koha::Acquisition::Order->new(
     {
         basketno => $basketno1,
         quantity => 2,
         biblionumber => $biblionumber,
         budget_id => $budget->{budget_id},
     }
-);
-NewOrderItem($itemnumber, $ordernumber);
+)->insert;
+my $ordernumber = $order->{ordernumber};
+$order->add_item( $itemnumber );
 
 # Begin tests
-my $order;
 is(scalar GetOrders($basketno1), 1, "1 order in basket1");
 ($order) = GetOrders($basketno1);
 is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket1's order");
 is(scalar GetOrders($basketno2), 0, "0 order in basket2");
 
-diag("Transfering order to 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) = GetOrders($basketno1, { 'cancelled' => 1 });
+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");
 
-ModReceiveOrder( $biblionumber, $newordernumber, 2, undef, undef, undef, undef, undef, undef, dt_from_string );
+# Bug 11552
+my $orders = SearchOrders({ ordernumber => $newordernumber });
+is ( scalar( @$orders ), 1, 'SearchOrders returns 1 order with newordernumber' );
+$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 = GetOrder( $newordernumber );
+
+ModReceiveOrder({
+    biblionumber => $biblionumber,
+    order       => $neworder,
+    quantityreceived => 2, 
+});
 CancelReceipt( $newordernumber );
 $order = GetOrder( $newordernumber );
 is ( $order->{ordernumber}, $newordernumber, 'Regression test Bug 11549: After a transfer, receive and cancel the receive should be possible.' );
 is ( $order->{basketno}, $basketno2, 'Regression test Bug 11549: The order still exist in the basket where the transfer has been done.');
 
-$dbh->rollback;
+$schema->storage->txn_rollback();