Bug 8037: (follow-up) improve GetBudgetByOrderNumber test
authorGalen Charlton <gmc@esilibrary.com>
Mon, 21 Oct 2013 23:34:46 +0000 (23:34 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 31 Oct 2013 14:57:18 +0000 (14:57 +0000)
This patch moves the GetBudgetByOrderNumber() test from
Budgets.t to Acquisition.t, thereby making it easier to
test without doing a direct SQL insert into the aqorders table.

To test:

[1] Verify that prove -v t/db_dependent/Budgets.t passes
[2] Verify that prove -v t/db_dependent/Acquisition.t passes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
t/db_dependent/Acquisition.t
t/db_dependent/Budgets.t

index 2b36068..e7fc32e 100755 (executable)
@@ -8,7 +8,7 @@ use POSIX qw(strftime);
 
 use C4::Bookseller qw( GetBookSellerFromId );
 
-use Test::More tests => 59;
+use Test::More tests => 60;
 
 BEGIN {
     use_ok('C4::Acquisition');
@@ -87,6 +87,8 @@ my $orders = SearchOrders({
 isa_ok( $orders, 'ARRAY' );
 is(scalar(@$orders), 3, 'retrieved 3 pending orders');
 
+ok( GetBudgetByOrderNumber($ordernumber1)->{'budget_id'} eq $budgetid, "GetBudgetByOrderNumber returns expected budget" );
+
 C4::Acquisition::CloseBasket( $basketno );
 my @lateorders = GetLateOrders(0);
 my $order = $lateorders[0];
index 7c7d386..bfb910b 100755 (executable)
@@ -92,10 +92,6 @@ ok($budget_id=AddBudget(
 #| budget_owner_id        | int(11)       | YES  |     | NULL              |       | 
 #| budget_permission      | int(1)        | YES  |     | 0                 |       | 
 
-C4::Context::dbh->do('INSERT INTO aqorders ( ordernumber, budget_id ) VALUES ( 987654321, ? )', {}, ( $budget_id ) );
-ok( GetBudgetByOrderNumber( '987654321' )->{'budget_id'} eq $budget_id, "GetBudgetByOrderNumber returns valid data" );
-C4::Context::dbh->do('DELETE FROM aqorders WHERE ordernumber = 987654321');
-
 my $budget;
 ok($budget=GetBudget($budget_id) ,"GetBudget OK");
 $$budget{budget_permission}=1;