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 646e770..a25d2a2 100644 (file)
--- a/t/db_dependent/Acquisition/TransferOrder.t
+++ b/t/db_dependent/Acquisition/TransferOrder.t
@@ -2,15 +2,15 @@
 
 use Modern::Perl;
 
-use Test::More tests => 11;
+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;
 
@@ -20,30 +20,30 @@ $schema->storage->txn_begin();
 my $dbh = C4::Context->dbh;
 $dbh->{RaiseError} = 1;
 
-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(
@@ -79,6 +79,12 @@ is(scalar GetOrders($basketno2), 0, "0 order in 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");
 
@@ -89,11 +95,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 = GetOrder( $newordernumber );
+
 ModReceiveOrder({
     biblionumber => $biblionumber,
-    ordernumber => $newordernumber,
+    order       => $neworder,
     quantityreceived => 2, 
-    datereceived => dt_from_string(),
 });
 CancelReceipt( $newordernumber );
 $order = GetOrder( $newordernumber );