Bug 17600: Standardize our EXPORT_OK

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

diff --git a/t/db_dependent/Acquisition/OrderFromSubscription.t b/t/db_dependent/Acquisition/OrderFromSubscription.t
old mode 100644 (file)
new mode 100755 (executable)
index 626fb57..d9db71c
--- a/t/db_dependent/Acquisition/OrderFromSubscription.t
+++ b/t/db_dependent/Acquisition/OrderFromSubscription.t
@@ -4,10 +4,10 @@ use Test::More tests => 12;
 
 use t::lib::TestBuilder;
 
-use_ok('C4::Acquisition');
-use_ok('C4::Biblio');
-use_ok('C4::Budgets');
-use_ok('C4::Serials');
+use_ok('C4::Acquisition', qw( NewBasket AddInvoice GetInvoice ModReceiveOrder GetInvoices ));
+use_ok('C4::Biblio', qw( AddBiblio ));
+use_ok('C4::Budgets', qw( AddBudgetPeriod AddBudget ));
+use_ok('C4::Serials', qw( NewSubscription GetSubscription subscriptionCurrentlyOnOrder ));
 
 use Koha::Acquisition::Orders;
 use Koha::Database;
@@ -30,7 +30,6 @@ my $bookseller = Koha::Acquisition::Bookseller->new(
 )->store;
 
 my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, '');
-my $budgetid;
 my $bpid = AddBudgetPeriod({
     budget_period_startdate   => '2015-01-01',
     budget_period_enddate     => '2015-12-31',
@@ -55,7 +54,7 @@ my $subscriptionid = NewSubscription(
 );
 die unless $subscriptionid;
 
-my ($basket, $basketno);
+my $basketno;
 ok($basketno = NewBasket($bookseller->id, 1), "NewBasket(  " . $bookseller->id . ", 1  ) returns $basketno");
 
 my $cost = 42.00;
@@ -79,7 +78,7 @@ my $ordernumber = $order->ordernumber;
 my $is_currently_on_order = subscriptionCurrentlyOnOrder( $subscription->{subscriptionid} );
 is ( $is_currently_on_order, 1, "The subscription is currently on order");
 
-$order = GetLastOrderNotReceivedFromSubscriptionid( $subscription->{subscriptionid} );
+$order = Koha::Acquisition::Orders->search({ subscriptionid => $subscription->{subscriptionid}, datereceived => undef })->next->unblessed;
 is ( $order->{subscriptionid}, $subscription->{subscriptionid}, "test subscriptionid for the last order not received");
 ok( $order->{ecost} == $cost, "test cost for the last order not received");
 
@@ -99,12 +98,21 @@ my ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
     }
 );
 
-$order = GetLastOrderReceivedFromSubscriptionid( $subscription->{subscriptionid} );
+$order = Koha::Acquisition::Orders->search(
+    {
+        subscriptionid => $subscriptionid,
+        datereceived   => { '!=' => undef }
+    },
+    {
+        order_by => [ { -desc => 'datereceived' }, { -desc => 'ordernumber' } ]
+    }
+)->next->unblessed;
+
 is ( $order->{subscriptionid}, $subscription->{subscriptionid}, "test subscriptionid for the last order received");
 ok( $order->{ecost} == $cost, "test cost for the last order received");
 
-$order = GetLastOrderNotReceivedFromSubscriptionid( $subscription->{subscriptionid} );
-is ( $order, undef, "test no not received order for a received order");
+$order = Koha::Acquisition::Orders->search({ subscriptionid => $subscription->{subscriptionid}, datereceived => undef });
+is ( $order->count, 0, "test no not received order for a received order");
 
 my @invoices = GetInvoices();
 my @invoices_linked_to_subscriptions = grep { $_->{is_linked_to_subscriptions} } @invoices;