From c6b7275bfea53f183a141e395e25542880384c66 Mon Sep 17 00:00:00 2001 From: Srdjan Date: Tue, 1 Apr 2014 18:43:26 +1300 Subject: [PATCH] Bug 5304: Use branch codes from the database rather than hardcoded CPL and MPL http://bugs.koha-community.org/show_bug.cgi?id=5304 Signed-off-by: Bernardo Gonzalez Kriegel No commit message No test plan. prove t/db_dependent/Items.t pass No koha-qa errors Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- t/db_dependent/Items.t | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t index d537888aa5..243ab2d6af 100755 --- a/t/db_dependent/Items.t +++ b/t/db_dependent/Items.t @@ -30,6 +30,8 @@ BEGIN { } my $dbh = C4::Context->dbh; +my $branches = GetBranches; +my ($branch1, $branch2) = keys %$branches; subtest 'General Add, Get and Del tests' => sub { @@ -44,7 +46,7 @@ subtest 'General Add, Get and Del tests' => sub { my ($bibnum, $bibitemnum) = get_biblio(); # Add an item. - my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => 'CPL', holdingbranch => 'CPL' } , $bibnum); + my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ homebranch => $branch1, holdingbranch => $branch1 } , $bibnum); cmp_ok($item_bibnum, '==', $bibnum, "New item is linked to correct biblionumber."); cmp_ok($item_bibitemnum, '==', $bibitemnum, "New item is linked to correct biblioitemnumber."); @@ -90,14 +92,14 @@ subtest 'GetHiddenItemnumbers tests' => sub { # Add two items my ($item1_bibnum, $item1_bibitemnum, $item1_itemnumber) = AddItem( - { homebranch => 'CPL', - holdingbranch => 'CPL', + { homebranch => $branch1, + holdingbranch => $branch1, withdrawn => 1 }, $biblionumber ); my ($item2_bibnum, $item2_bibitemnum, $item2_itemnumber) = AddItem( - { homebranch => 'MPL', - holdingbranch => 'MPL', + { homebranch => $branch2, + holdingbranch => $branch2, withdrawn => 0 }, $biblionumber ); @@ -138,7 +140,7 @@ subtest 'GetHiddenItemnumbers tests' => sub { # Two variables, a value each $opachiddenitems = " withdrawn: [1] - homebranch: [MPL] + homebranch: [$branch2] "; C4::Context->set_preference( 'OpacHiddenItems', $opachiddenitems ); @hidden = GetHiddenItemnumbers( @items ); @@ -161,23 +163,20 @@ subtest 'GetItemsInfo tests' => sub { $dbh->{AutoCommit} = 0; $dbh->{RaiseError} = 1; - my $homebranch = 'CPL'; - my $holdingbranch = 'MPL'; - # Add a biblio - my ($biblionumber) = get_biblio(); + my ($biblionumber, $biblioitemnumber) = get_biblio(); # Add an item my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({ - homebranch => $homebranch, - holdingbranch => $holdingbranch + homebranch => $branch1, + holdingbranch => $branch2 }, $biblionumber ); - my $branch = GetBranchDetail( $homebranch ); + my $branch = GetBranchDetail( $branch1 ); $branch->{ opac_info } = "homebranch OPAC info"; ModBranch($branch); - $branch = GetBranchDetail( $holdingbranch ); + $branch = GetBranchDetail( $branch2 ); $branch->{ opac_info } = "holdingbranch OPAC info"; ModBranch($branch); -- 2.39.5