From: Kenza Zaki Date: Thu, 8 Aug 2013 09:40:13 +0000 (+0200) Subject: Bug 10699: add explicit return value for DeleteBranchTransferLimits() X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=88f15db30a9da6a24cf575759a97e8765be61ad4;p=koha.git Bug 10699: add explicit return value for DeleteBranchTransferLimits() This patch adds return values to DeleteBranchTransferLimits: 1 if a Transfer Limit is deleted undef if no parameters is given 0E0 if a wrong parameter is given More, it fixes and adds some tests in t/db_dependent/Circulation_transfers.t To test : prove t/db_dependent/Circulation_transfers.t t/db_dependent/Circulation_transfers.t .. ok All tests successful. Files=1, Tests=14, 19 wallclock secs ( 0.02 usr 0.01 sys + 0.39 cusr 0.02 csys = 0.44 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Tested with patch for bug 10692 applied. Signed-off-by: Galen Charlton --- diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 94ef6c85e7..eea82a785a 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -3270,9 +3270,10 @@ Deletes all the branch transfer limits for one branch sub DeleteBranchTransferLimits { my $branch = shift; + return unless $branch; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("DELETE FROM branch_transfer_limits WHERE fromBranch = ?"); - $sth->execute($branch); + return $sth->execute($branch); } sub ReturnLostItem{ diff --git a/t/db_dependent/Circulation_transfers.t b/t/db_dependent/Circulation_transfers.t index 5724f4fa56..7f4dff16b7 100644 --- a/t/db_dependent/Circulation_transfers.t +++ b/t/db_dependent/Circulation_transfers.t @@ -9,7 +9,7 @@ use C4::Circulation; use Koha::DateUtils; use DateTime::Duration; -use Test::More tests => 15; +use Test::More tests => 17; BEGIN { use_ok('C4::Circulation'); @@ -191,8 +191,8 @@ is( 1, "A Branch TransferLimit has been deleted" ); -#FIXME :The following test should pass but doesn't because currently the routine DeleteBranchTransferLimit returns nothin -#is(C4::Circulation::DeleteBranchTransferLimits(),undef,"Without parameters DeleteBranchTransferLimit returns undef"); +is(C4::Circulation::DeleteBranchTransferLimits(),undef,"Without parameters DeleteBranchTransferLimit returns undef"); +is(C4::Circulation::DeleteBranchTransferLimits('B'),'0E0',"With a wrong id DeleteBranchTransferLimit returns 0E0"); #Test DeleteTransfer is( C4::Circulation::DeleteTransfer($item_id1),