From b7e62ea26cd09bee5c72749af6faea7c15b57fc3 Mon Sep 17 00:00:00 2001 From: Bouzid Fergani Date: Tue, 1 Dec 2015 14:49:39 -0500 Subject: [PATCH] Bug 11371 - QA fix 2 --- t/db_dependent/Budgets.t | 88 +++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t index 1a3d772..849bb1f 100755 --- a/t/db_dependent/Budgets.t +++ b/t/db_dependent/Budgets.t @@ -430,30 +430,6 @@ $budget_period_id_cloned = C4::Budgets::CloneBudgetPeriod( mark_original_budget_as_inactive => 1, } ); -# Add A budget Period -if (C4::Context->preference('dateformat') eq "metric"){ -ok($bpid=AddBudgetPeriod( - { budget_period_startdate =>'01-01-2008' - , budget_period_enddate =>'31-12-2008' - , budget_period_description =>"MAPERI" - , budget_period_active =>1}), - "AddBudgetPeriod returned $bpid"); -} elsif (C4::Context->preference('dateformat') eq "us"){ -ok($bpid=AddBudgetPeriod( - { budget_period_startdate =>'01-01-2008' - , budget_period_enddate =>'12-31-2008' - , budget_period_description =>"MAPERI" - , budget_period_active =>1}), - "AddBudgetPeriod returned $bpid"); -} -else{ -ok($bpid=AddBudgetPeriod( - {budget_period_startdate=>'2008-01-01' - ,budget_period_enddate =>'2008-12-31' - ,budget_period_active =>1 - ,budget_period_description =>"MAPERI" - }), -"AddBudgetPeriod returned $bpid"); $budget_hierarchy = GetBudgetHierarchy($budget_period_id); is( $budget_hierarchy->[0]->{children}->[0]->{budget_name}, 'budget_11', 'GetBudgetHierarchy should return budgets ordered by name, first child is budget_11' ); @@ -493,40 +469,34 @@ for my $budget (@$budget_hierarchy_cloned) { is( $number_of_budgets_not_reset, 0, 'CloneBudgetPeriod has reset all budgets (funds)' ); -my $budget_name = GetBudgetName( $budget_id ); -is($budget_name, $budget->{budget_name}, "Test the GetBudgetName routine"); - -my $second_budget_id; -ok($second_budget_id=AddBudget( - { budget_code => "ZZZZ", - budget_amount => "500.00", - budget_name => "Art", - budget_notes => "This is a note", - budget_active => 1, - budget_period_id => $bpid, - } - ), - "AddBudget returned $second_budget_id"); - -my $budgets = GetBudgets({ budget_period_id => $bpid}); -ok($budgets->[0]->{budget_name} lt $budgets->[1]->{budget_name}, 'default sort order for GetBudgets is by name'); - -ok(GetBudgetPeriodDescription($budget_id)->{budget_period_description} eq "MAPERI", - "GetBudgetPeriodDescription OK"); - -ok(GetBudgetsByActivity(1) > 0, - "GetActiveBudgets can return active budgets"); - -# Deactivate budget period -$budgetperiod=GetBudgetPeriod($bpid); -$$budgetperiod{budget_period_active}=0; -ModBudgetPeriod($budgetperiod); - -ok(GetBudgetsByActivity(0) > 0, - "GetActiveBudgets can return inactive budgets"); -my $del_status; -ok($del_status=DelBudget($budget_id), - "DelBudget returned $del_status"); +#GetBudgetPeriodDescription +$my_budgetperiod = { + budget_period_startdate => '2008-01-01', + budget_period_enddate => '2008-12-31', + budget_period_description => 'MAPERI', + budget_period_active => 0, +}; +$bpid = AddBudgetPeriod($my_budgetperiod); +$my_budget = { + budget_code => 'ABCD', + budget_amount => '123.132000', + budget_name => 'Periodiques', + budget_notes => 'This is a note', + budget_period_id => $bpid, +}; +$budget_id = AddBudget($my_budget); +my $data=GetBudgetPeriodDescription($budget_id); +is( $data->{budget_period_description}, 'MAPERI' ,'GetBudgetPeriodDescription return right value'); + +#GetBudgetsByActivity +my $result=C4::Budgets::GetBudgetsByActivity(1); +isnt( $result, undef ,'GetBudgetsByActivity return correct value with parameter 1'); +$result=C4::Budgets::GetBudgetsByActivity(0); + isnt( $result, undef ,'GetBudgetsByActivity return correct value with parameter 0'); +$result=C4::Budgets::GetBudgetsByActivity(); + is( $result, 0 , 'GetBudgetsByActivity return 0 with none parameter or other 0 or 1' ); +DelBudget($budget_id); +DelBudgetPeriod($bpid); # MoveOrders my $number_orders_moved = C4::Budgets::MoveOrders(); @@ -676,4 +646,4 @@ sub _get_budgetname_by_id { # C4::Context->userenv sub Mock_userenv { return $userenv; -}} +} -- 1.7.9.5