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>
137 lines
4.2 KiB
Perl
Executable file
137 lines
4.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
#
|
|
# This Koha test module is a stub!
|
|
# Add more tests here!!!
|
|
|
|
use Modern::Perl;
|
|
|
|
use Test::More tests => 6;
|
|
use List::MoreUtils qw(any none);
|
|
use MARC::Record;
|
|
use C4::Biblio qw( GetMarcFromKohaField AddBiblio );
|
|
use C4::XISBN qw( get_xisbns );
|
|
use C4::Context;
|
|
use C4::Search;
|
|
use Koha::Database;
|
|
use t::lib::Mocks;
|
|
use Test::MockModule;
|
|
|
|
BEGIN {
|
|
use_ok('C4::XISBN', qw( get_xisbns ));
|
|
}
|
|
|
|
my $schema = Koha::Database->new->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
my $engine = C4::Context->preference("SearchEngine") // 'Zebra';
|
|
my $search_module = Test::MockModule->new("Koha::SearchEngine::${engine}::Search");
|
|
|
|
$search_module->mock('simple_search_compat', \&Mock_simple_search_compat );
|
|
|
|
my $context = C4::Context->new;
|
|
|
|
my ( $biblionumber_tag, $biblionumber_subfield ) =
|
|
GetMarcFromKohaField( 'biblio.biblionumber' );
|
|
my ( $isbn_tag, $isbn_subfield ) =
|
|
GetMarcFromKohaField( 'biblioitems.isbn' );
|
|
|
|
# Harry Potter and the Sorcerer's Stone, 1st American ed. 1997
|
|
my $isbn1 = '0590353403';
|
|
# ThingISBN match : Silent Wing, First Edition 1998
|
|
my $isbn2 = '0684843897';
|
|
# XISBN match : Harry Potter and the Sorcerer's Stone,
|
|
# 1. Scholastic mass market paperback printing1.
|
|
my $isbn3 = '043936213X';
|
|
# Finn Family Moomintroll, won't match to other isbns
|
|
my $isbn4 = '014030150X';
|
|
|
|
my $biblionumber1 = _add_biblio_with_isbn($isbn1);
|
|
my $biblionumber2 = _add_biblio_with_isbn($isbn2);
|
|
my $biblionumber3 = _add_biblio_with_isbn($isbn3);
|
|
my $biblionumber4 = _add_biblio_with_isbn($isbn4);
|
|
|
|
my $trial = C4::XISBN::_get_biblio_from_xisbn($isbn1);
|
|
is( $trial->{biblionumber},
|
|
$biblionumber1, "Gets biblionumber like the previous test." );
|
|
|
|
## Test ThingISBN
|
|
t::lib::Mocks::mock_preference( 'ThingISBN', 1 );
|
|
|
|
my $results_thingisbn;
|
|
eval { $results_thingisbn = C4::XISBN::get_xisbns($isbn1, $biblionumber4); };
|
|
SKIP: {
|
|
skip "Problem retrieving ThingISBN", 2
|
|
unless $@ eq '';
|
|
ok( (any { $_->{'biblionumber'} eq $biblionumber1 } @$results_thingisbn),
|
|
"Gets correct biblionumber from a book with a similar isbn using ThingISBN." );
|
|
ok( (any { $_->{'biblionumber'} eq $biblionumber3 } @$results_thingisbn),
|
|
"Gets correct biblionumber from a book with a similar isbn using ThingISBN." );
|
|
}
|
|
|
|
eval { $results_thingisbn = C4::XISBN::get_xisbns($isbn1,$biblionumber1); };
|
|
SKIP: {
|
|
skip "Problem retrieving ThingISBN", 1
|
|
unless $@ eq '';
|
|
is( $results_thingisbn->[0]->{biblionumber},
|
|
$biblionumber3,
|
|
"Gets correct biblionumber from a different book with a similar isbn using ThingISBN." );
|
|
}
|
|
|
|
eval { $results_thingisbn = C4::XISBN::get_xisbns($isbn1,$biblionumber3); };
|
|
SKIP: {
|
|
skip "Problem retrieving ThingISBN", 1
|
|
unless $@ eq '';
|
|
ok( (none { $_->{'biblionumber'} eq $biblionumber3 } @$results_thingisbn),
|
|
"Doesn't get biblionumber if the biblionumber matches the one passed to the sub." );
|
|
}
|
|
|
|
# Util subs
|
|
|
|
# Add new biblio with isbn and return biblionumber
|
|
sub _add_biblio_with_isbn {
|
|
my $isbn = shift;
|
|
|
|
my $marc_record = MARC::Record->new;
|
|
my $field = MARC::Field->new( $isbn_tag, '', '', $isbn_subfield => $isbn );
|
|
$marc_record->append_fields($field);
|
|
my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $marc_record, '' );
|
|
return $biblionumber;
|
|
}
|
|
|
|
# Mocked subs
|
|
|
|
# Koha::SearchEngine::${SearchEngine}::Search::simple_search_compat
|
|
sub Mock_simple_search_compat {
|
|
my $self = shift;
|
|
my $query = shift;
|
|
my @results;
|
|
|
|
$query =~ s/-//g;
|
|
my $ret_biblionumber;
|
|
if ( $query eq "nb=$isbn1" ) {
|
|
$ret_biblionumber = $biblionumber1;
|
|
}
|
|
elsif ( $query eq "nb=$isbn2" ) {
|
|
$ret_biblionumber = $biblionumber2;
|
|
}
|
|
elsif ( $query eq "nb=$isbn3" ) {
|
|
$ret_biblionumber = $biblionumber3;
|
|
}
|
|
|
|
my $record = MARC::Record->new;
|
|
$record->leader(' ngm a22 7a 4500');
|
|
my $biblionumber_field;
|
|
if ( $biblionumber_tag < 10 ) {
|
|
$biblionumber_field =
|
|
MARC::Field->new( $biblionumber_tag, $ret_biblionumber );
|
|
}
|
|
else {
|
|
$biblionumber_field = MARC::Field->new( $biblionumber_tag, '', '',
|
|
$biblionumber_subfield => $ret_biblionumber );
|
|
}
|
|
$record->append_fields($biblionumber_field);
|
|
|
|
push @results, $record->as_xml();
|
|
|
|
return ( undef, \@results, 1 );
|
|
}
|