Bug 16404: Fix Circulation/Branch.t (tests 8-11)
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Sat, 30 Apr 2016 12:52:29 +0000 (14:52 +0200)
committerKyle M Hall <kyle@bywatersolutions.com>
Tue, 3 May 2016 15:21:31 +0000 (15:21 +0000)
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 <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Note: I do not see the usefulness of the lazy_any variable, I don't
think it make things easier to read.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
t/db_dependent/Circulation/Branch.t

index d2f4583..c0c89c6 100644 (file)
@@ -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"
 );