From 59ec82124602356d9da478e8a41afa8fba13810c Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Sat, 30 Apr 2016 14:52:29 +0200 Subject: [PATCH] Bug 16404: Fix Circulation/Branch.t (tests 8-11) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: Failed test 'GetBranchitem returns holdallowed and return branch' at t/db_dependent/Circulation/Branch.t line 226. Structures begin differing at: $got->{hold_fulfillment_policy} = 'any' $expected->{hold_fulfillment_policy} = Does not exist Failed test 'Without parameters GetBranchItemRule returns the values in default_circ_rules' at t/db_dependent/Circulation/Branch.t line 234. Structures begin differing at: $got->{hold_fulfillment_policy} = 'any' $expected->{hold_fulfillment_policy} = Does not exist Failed test 'With only a branchcode GetBranchItemRule returns values in default_branch_circ_rules' at t/db_dependent/Circulation/Branch.t line 239. Structures begin differing at: $got->{hold_fulfillment_policy} = 'any' $expected->{hold_fulfillment_policy} = Does not exist Failed test 'With only one parametern GetBranchItemRule returns default values' at t/db_dependent/Circulation/Branch.t line 244. Structures begin differing at: $got->{hold_fulfillment_policy} = 'any' $expected->{hold_fulfillment_policy} = Does not exist Test plan: Run test before and after applying this patch. Signed-off-by: Marc VĂ©ron --- t/db_dependent/Circulation/Branch.t | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/t/db_dependent/Circulation/Branch.t b/t/db_dependent/Circulation/Branch.t index d2f4583..c0c89c6 100644 --- a/t/db_dependent/Circulation/Branch.t +++ b/t/db_dependent/Circulation/Branch.t @@ -223,27 +223,28 @@ is_deeply( ); #Test GetBranchItemRule +my @lazy_any = ( 'hold_fulfillment_policy' => 'any' ); is_deeply( GetBranchItemRule( $samplebranch1->{branchcode}, - $sampleitemtype1->{itemtype} + $sampleitemtype1->{itemtype}, ), - { returnbranch => 'homebranch', holdallowed => 5 }, + { returnbranch => 'homebranch', holdallowed => 5, @lazy_any }, "GetBranchitem returns holdallowed and return branch" ); is_deeply( GetBranchItemRule(), - { returnbranch => 'homebranch', holdallowed => 3 }, + { returnbranch => 'homebranch', holdallowed => 3, @lazy_any }, "Without parameters GetBranchItemRule returns the values in default_circ_rules" ); is_deeply( GetBranchItemRule( $samplebranch2->{branchcode} ), - { returnbranch => 'holdingbranch', holdallowed => 1 }, + { returnbranch => 'holdingbranch', holdallowed => 1, @lazy_any }, "With only a branchcode GetBranchItemRule returns values in default_branch_circ_rules" ); is_deeply( GetBranchItemRule( -1, -1 ), - { returnbranch => 'homebranch', holdallowed => 3 }, + { returnbranch => 'homebranch', holdallowed => 3, @lazy_any }, "With only one parametern GetBranchItemRule returns default values" ); -- 1.7.10.4