Bug 17600: Standardize our EXPORT_OK

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

diff --git a/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t b/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
old mode 100644 (file)
new mode 100755 (executable)
index c801dd7..9b52802
--- a/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
+++ b/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
@@ -3,63 +3,71 @@
 use Modern::Perl;
 
 use Test::More;
-use C4::Acquisition;
-use C4::Biblio;
-use C4::Bookseller;
-use C4::Budgets;
+use C4::Acquisition qw( NewBasket GetOrders GetOrdersByBiblionumber GetOrder );
+use C4::Biblio qw( AddBiblio );
+use C4::Budgets qw( AddBudget GetBudget );
+use Koha::Database;
+use Koha::Acquisition::Orders;
+
 use MARC::Record;
 
-my $booksellerid = C4::Bookseller::AddBookseller(
+#Start transaction
+my $schema = Koha::Database->new()->schema();
+$schema->storage->txn_begin();
+
+my $bookseller = Koha::Acquisition::Bookseller->new(
     {
         name => "my vendor",
         address1 => "bookseller's address",
         phone => "0123456",
         active => 1
     }
-);
+)->store;
 
 my $basketno = C4::Acquisition::NewBasket(
-    $booksellerid
+    $bookseller->id
 );
 
 my $budgetid = C4::Budgets::AddBudget(
     {
-        budget_code => "budget_code_test_getordersbybib",
-        budget_name => "budget_name_test_getordersbybib",
+        budget_code => "budget_code_test",
+        budget_name => "budget_name_test",
     }
 );
 
 my $budget = C4::Budgets::GetBudget( $budgetid );
 
-my ($ordernumber1, $ordernumber2, $ordernumber3);
 my ($biblionumber1, $biblioitemnumber1) = AddBiblio(MARC::Record->new, '');
 my ($biblionumber2, $biblioitemnumber2) = AddBiblio(MARC::Record->new, '');
-( undef, $ordernumber1 ) = C4::Acquisition::NewOrder(
+my $order1 = Koha::Acquisition::Order->new(
     {
         basketno => $basketno,
         quantity => 24,
         biblionumber => $biblionumber1,
         budget_id => $budget->{budget_id},
     }
-);
+)->store;
+my $ordernumber1 = $order1->ordernumber;
 
-( undef, $ordernumber2 ) = C4::Acquisition::NewOrder(
+my $order2 = Koha::Acquisition::Order->new(
     {
         basketno => $basketno,
         quantity => 42,
         biblionumber => $biblionumber2,
         budget_id => $budget->{budget_id},
     }
-);
+)->store;
+my $ordernumber2 = $order2->ordernumber;
 
-( undef, $ordernumber3 ) = C4::Acquisition::NewOrder(
+my $order3 = Koha::Acquisition::Order->new(
     {
         basketno => $basketno,
         quantity => 4,
         biblionumber => $biblionumber2,
         budget_id => $budget->{budget_id},
     }
-);
+)->store;
+my $ordernumber3 = $order3->ordernumber;
 
 my @orders = GetOrdersByBiblionumber();
 is(scalar(@orders), 0, 'GetOrdersByBiblionumber : no argument, return undef');
@@ -70,15 +78,7 @@ is(scalar(@orders), 1, '1 order on biblionumber 1');
 @orders = GetOrdersByBiblionumber( $biblionumber2 );
 is(scalar(@orders), 2, '2 orders on biblionumber 2');
 
-END {
-    C4::Acquisition::DelOrder( 1, $ordernumber1 );
-    C4::Acquisition::DelOrder( 2, $ordernumber2 );
-    C4::Acquisition::DelOrder( 3, $ordernumber3 );
-    C4::Budgets::DelBudget( $budgetid );
-    C4::Acquisition::DelBasket( $basketno );
-    C4::Bookseller::DelBookseller( $booksellerid );
-    C4::Biblio::DelBiblio($biblionumber1);
-    C4::Biblio::DelBiblio($biblionumber2);
-};
+#End transaction
+$schema->storage->txn_rollback();
 
 done_testing;