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>
129 lines
4.3 KiB
Perl
Executable file
129 lines
4.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This script includes tests for ReNewSubscription
|
|
|
|
# Copyright 2015 BibLibre, Paul Poulain
|
|
# Copyright 2018 Catalyst IT, Alex Buckley
|
|
#
|
|
# 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 => 7;
|
|
use Test::MockModule;
|
|
use t::lib::TestBuilder;
|
|
use t::lib::Mocks;
|
|
|
|
use C4::Serials qw( NewSubscription ReNewSubscription GetSubscription GetSubscriptionLength );
|
|
|
|
use Koha::Database;
|
|
use Koha::Subscription::Histories;
|
|
|
|
my $schema = Koha::Database->new->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
my $builder = t::lib::TestBuilder->new();
|
|
|
|
# create fake numberpattern & fake periodicity
|
|
my $frequency = $builder->build({
|
|
source => 'SubscriptionFrequency',
|
|
value => {
|
|
description => "daily",
|
|
unit => "day",
|
|
unitsperissue => 1,
|
|
},
|
|
});
|
|
|
|
my $pattern = $builder->build({
|
|
source => 'SubscriptionNumberpattern',
|
|
value => {
|
|
label => 'mock',
|
|
description =>'mock',
|
|
numberingmethod => 'Issue {X}',
|
|
add1 => 1,
|
|
every1 => 1,
|
|
setto1 => 100,
|
|
}
|
|
});
|
|
|
|
my $biblio = $builder->build_sample_biblio();
|
|
|
|
# Create fake subscription, daily subscription, duration 12 months, issues startint at #100
|
|
my $subscription = $builder->build({
|
|
source => 'Subscription',
|
|
value => {
|
|
biblionumber => $biblio->biblionumber,
|
|
startdate => '2015-01-01',
|
|
enddate => '2015-12-31',
|
|
aqbooksellerid => 1,
|
|
periodicity => $frequency->{id},
|
|
numberpattern => $pattern->{id},
|
|
monthlength => 12,
|
|
},
|
|
});
|
|
|
|
my $subscriptionhistory = $builder->build({
|
|
source => 'Subscriptionhistory',
|
|
value => {
|
|
biblionumber => $biblio->biblionumber,
|
|
subscriptionid => $subscription->{subscriptionid},
|
|
histenddate => undef,
|
|
opacnote => 'Testing',
|
|
}
|
|
});
|
|
|
|
# Actual testing starts here!
|
|
# Renew the subscription and check that enddate has not been set
|
|
ReNewSubscription(
|
|
{
|
|
subscriptionid => $subscription->{subscriptionid},
|
|
startdate => "2016-01-01",
|
|
monthlength => 12
|
|
}
|
|
);
|
|
|
|
# Calculate the subscription length for the renewal for issues, days and months
|
|
my ($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('issues', 7);
|
|
is ( $numberlength, 7, "Subscription length is 7 issues");
|
|
|
|
($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('weeks', 7);
|
|
is ( $weeklength, 7, "Subscription length is 7 weeks");
|
|
|
|
($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('months', 7);
|
|
is ( $monthlength, 7, "Subscription length is 7 months");
|
|
|
|
# Check subscription length when no value is inputted into the numeric sublength field
|
|
($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('months', '');
|
|
is ($monthlength, undef, "Subscription length is undef months, invalid month data was not stored");
|
|
|
|
# Check subscription length when a letter is inputted into the numeric sublength field
|
|
($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('issues', 'w');
|
|
is ($monthlength, undef, "Subscription length is undef issues, invalid issue data was not stored");
|
|
|
|
# Check subscription length when a special character is inputted into numberic sublength field
|
|
($numberlength, $weeklength, $monthlength) = GetSubscriptionLength('weeks', '!');
|
|
is ($weeklength, undef, "Subscription length is undef weeks, invalid weeks data was not stored");
|
|
|
|
# Renew the subscription and check that enddate has not been set
|
|
|
|
my $history = Koha::Subscription::Histories->find($subscription->{subscriptionid});
|
|
|
|
is ( $history->histenddate(), undef, 'subscription history not empty after renewal');
|
|
|
|
# End of tests
|
|
|
|
$schema->storage->txn_rollback;
|
|
|