Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
212 lines
9.3 KiB
Perl
Executable file
212 lines
9.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This script includes tests for GetReserveFee and ChargeReserveFee
|
|
|
|
# Copyright 2015 Rijksmuseum
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 3;
|
|
use Test::MockModule;
|
|
use t::lib::TestBuilder;
|
|
use t::lib::Mocks;
|
|
|
|
use C4::Circulation qw( AddIssue );
|
|
use C4::Reserves qw( GetReserveFee ChargeReserveFee AddReserve );
|
|
use Koha::Database;
|
|
|
|
my $schema = Koha::Database->new->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
my $builder = t::lib::TestBuilder->new();
|
|
my $library = $builder->build({
|
|
source => 'Branch',
|
|
});
|
|
my $mContext = Test::MockModule->new('C4::Context');
|
|
$mContext->mock( 'userenv', sub {
|
|
return { branch => $library->{branchcode} };
|
|
});
|
|
|
|
my $dbh = C4::Context->dbh; # after start transaction of testbuilder
|
|
|
|
# Category with hold fee, two patrons
|
|
$builder->build({
|
|
source => 'Category',
|
|
value => {
|
|
categorycode => 'XYZ1',
|
|
reservefee => 2,
|
|
},
|
|
});
|
|
my $patron1 = $builder->build({
|
|
source => 'Borrower',
|
|
value => {
|
|
categorycode => 'XYZ1',
|
|
},
|
|
});
|
|
my $patron2 = $builder->build({
|
|
source => 'Borrower',
|
|
value => {
|
|
categorycode => 'XYZ1',
|
|
},
|
|
});
|
|
my $patron3 = $builder->build({
|
|
source => 'Borrower',
|
|
});
|
|
|
|
# One biblio and two items
|
|
my $biblio = $builder->build_sample_biblio;
|
|
my $item1 = $builder->build_sample_item(
|
|
{
|
|
biblionumber => $biblio->biblionumber,
|
|
notforloan => 0,
|
|
}
|
|
);
|
|
my $item2 = $builder->build_sample_item(
|
|
{
|
|
biblionumber => $biblio->biblionumber,
|
|
notforloan => 0,
|
|
}
|
|
);
|
|
|
|
subtest 'GetReserveFee' => sub {
|
|
plan tests => 5;
|
|
|
|
C4::Circulation::AddIssue( $patron1, $item1->barcode, '2015-12-31', 0, undef, 0, {} ); # the date does not really matter
|
|
my $acc2 = acctlines( $patron2->{borrowernumber} );
|
|
my $res1 = addreserve( $patron1->{borrowernumber} );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'not_always');
|
|
my $fee = C4::Reserves::GetReserveFee( $patron2->{borrowernumber}, $biblio->biblionumber );
|
|
is( $fee > 0, 1, 'Patron 2 should be charged cf GetReserveFee' );
|
|
C4::Reserves::ChargeReserveFee( $patron2->{borrowernumber}, $fee, $biblio->title );
|
|
is( acctlines( $patron2->{borrowernumber} ), $acc2 + 1, 'Patron 2 has been charged by ChargeReserveFee' );
|
|
|
|
# If we delete the reserve, there should be no charge
|
|
$dbh->do( "DELETE FROM reserves WHERE borrowernumber = ?", undef, ( $patron1->{borrowernumber}) );
|
|
$fee = C4::Reserves::GetReserveFee( $patron2->{borrowernumber}, $biblio->biblionumber );
|
|
is( $fee, 0, 'HoldFeeMode=not_always, Patron 2 should not be charged' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_placed');
|
|
$fee = C4::Reserves::GetReserveFee( $patron2->{borrowernumber}, $biblio->biblionumber );
|
|
is( int($fee), 2, 'HoldFeeMode=any_time_is_placed, Patron 2 should be charged' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_collected');
|
|
$fee = C4::Reserves::GetReserveFee( $patron2->{borrowernumber}, $biblio->biblionumber );
|
|
is( int($fee), 2, 'HoldFeeMode=any_time_is_collected, Patron 2 should be charged' );
|
|
};
|
|
|
|
subtest 'Integration with AddReserve' => sub {
|
|
plan tests => 2;
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
subtest 'Items are not issued' => sub {
|
|
plan tests => 3;
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'not_always');
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'not_always - No fee charged for patron 1 if not issued' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_placed');
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 1, 'any_time_is_placed - Patron should be always charged' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_collected');
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged when placing a hold' );
|
|
};
|
|
|
|
subtest 'Items are issued' => sub {
|
|
plan tests => 3;
|
|
|
|
C4::Circulation::AddIssue( $patron2, $item1->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'not_always');
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'not_always - Patron should not be charged if items are not all checked out' );
|
|
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron3->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
# FIXME Are we sure it's the expected behavior?
|
|
is( acctlines( $patron1->{borrowernumber} ), 1, 'not_always - Patron should be charged if all the items are not checked out and at least 1 hold is already placed' );
|
|
|
|
C4::Circulation::AddIssue( $patron3, $item2->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 1, 'not_always - Patron should be charged if all items are checked out' );
|
|
};
|
|
};
|
|
|
|
subtest 'Integration with AddIssue' => sub {
|
|
plan tests => 5;
|
|
|
|
$dbh->do( "DELETE FROM issues WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
|
|
$dbh->do( "DELETE FROM reserves WHERE biblionumber=?", undef, $biblio->biblionumber );
|
|
$dbh->do( "DELETE FROM accountlines WHERE borrowernumber=?", undef, $patron1->{borrowernumber} );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'not_always');
|
|
C4::Circulation::AddIssue( $patron1, $item1->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'not_always - Patron should not be charged' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_placed');
|
|
$dbh->do( "DELETE FROM issues WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
|
|
C4::Circulation::AddIssue( $patron1, $item1->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'not_always - Patron should not be charged' );
|
|
|
|
t::lib::Mocks::mock_preference('HoldFeeMode', 'any_time_is_collected');
|
|
$dbh->do( "DELETE FROM issues WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
|
|
C4::Circulation::AddIssue( $patron1, $item1->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged when checking out an item which was not placed hold for him' );
|
|
|
|
$dbh->do( "DELETE FROM issues WHERE borrowernumber = ?", undef, $patron1->{borrowernumber} );
|
|
my $id = addreserve( $patron1->{borrowernumber} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 0, 'any_time_is_collected - Patron should not be charged yet (just checking to make sure)');
|
|
C4::Circulation::AddIssue( $patron1, $item1->barcode, '2015-12-31', 0, undef, 0, {} );
|
|
is( acctlines( $patron1->{borrowernumber} ), 1, 'any_time_is_collected - Patron should not be charged when checking out an item which was not placed hold for him' );
|
|
};
|
|
|
|
sub acctlines { #calculate number of accountlines for a patron
|
|
my @temp = $dbh->selectrow_array( "SELECT COUNT(*) FROM accountlines WHERE borrowernumber=?", undef, ( $_[0] ) );
|
|
return $temp[0];
|
|
}
|
|
|
|
sub addreserve {
|
|
return AddReserve(
|
|
{
|
|
branchcode => $library->{branchcode},
|
|
borrowernumber => $_[0],
|
|
biblionumber => $biblio->biblionumber,
|
|
priority => '1',
|
|
title => $biblio->title,
|
|
}
|
|
);
|
|
}
|
|
|
|
$schema->storage->txn_rollback;
|
|
|