From 03641d9111525f0a137acd001cbb9e303fe89586 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 18 Sep 2023 09:05:13 +0000 Subject: [PATCH] Bug 34812: Move subtests to db_dependent/Koha.t Note that a few isbn tests were identical. Tidied the three moved subtests here. Test plan: Run t/db_dependent/Koha.t Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- t/Koha.t | 134 ----------------------------- t/db_dependent/Koha.t | 190 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 172 insertions(+), 152 deletions(-) delete mode 100755 t/Koha.t diff --git a/t/Koha.t b/t/Koha.t deleted file mode 100755 index 63788e2fa1..0000000000 --- a/t/Koha.t +++ /dev/null @@ -1,134 +0,0 @@ -#!/usr/bin/perl - -# 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 . - -use Modern::Perl; -use Test::More tests => 4; -use Test::MockModule; - -use t::lib::TestBuilder; - -use_ok('C4::Koha', qw( xml_escape GetVariationsOfISBN GetVariationsOfISBNs GetVariationsOfISSN GetVariationsOfISSNs)); - -use C4::Context; -use Koha::Libraries; - -subtest 'isbn stuff' => sub { - plan tests => 29; - - my $isbn13 = "9780330356473"; - my $isbn13D = "978-0-330-35647-3"; - my $isbn10 = "033035647X"; - my $isbn10D = "0-330-35647-X"; - - my $undef = undef; - is(xml_escape($undef), '', 'xml_escape() returns empty string on undef input'); - my $str = q{'"&<>'}; - is(xml_escape($str), ''"&<>'', 'xml_escape() works as expected'); - is($str, q{'"&<>'}, '... and does not change input in place'); - - is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens'); - is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical'); - is(C4::Koha::_isbn_cleanup('978-0-321-49694-2'), '0321496949', '_isbn_cleanup converts ISBN-13 to ISBN-10'); - - is(C4::Koha::NormalizeISBN({ isbn => '978-0-321-49694-2 (pbk.)', format => 'ISBN-10', strip_hyphens => 1 }), '0321496949', 'Test NormalizeISBN with all features enabled' ); - - my @isbns = qw/ 978-0-321-49694-2 0-321-49694-9 978-0-321-49694-2 0321496949 9780321496942/; - is( join('|', @isbns), join('|', GetVariationsOfISBN('978-0-321-49694-2 (pbk.)')), 'GetVariationsOfISBN returns all variations' ); - - is( join('|', @isbns), join('|', GetVariationsOfISBNs('978-0-321-49694-2 (pbk.)')), 'GetVariationsOfISBNs returns all variations' ); - - my $isbn; - eval { - $isbn = C4::Koha::NormalizeISBN({ isbn => '0788893777 (2 DVD 45th ed)', format => 'ISBN-10', strip_hyphens => 1 }); - }; - ok($@ eq '', 'NormalizeISBN does not throw exception when parsing invalid ISBN (bug 12243)'); - $isbn = C4::Koha::NormalizeISBN({ isbn => '0788893777 (2 DVD 45th ed)', format => 'ISBN-10', strip_hyphens => 1, return_invalid =>1 }); - is($isbn, '0788893777 (2 DVD 45th ed)', 'NormalizeISBN returns original string when converting to ISBN10 an ISBN starting with 979 (bug 13167)'); - - eval { - $isbn = C4::Koha::NormalizeISBN({ isbn => '979-10-90085-00-8', format => 'ISBN-10', strip_hyphens => 1 }); - }; - ok($@ eq '', 'NormalizeISBN does not throw exception when converting to ISBN10 an ISBN starting with 979 (bug 13167)'); - ok(!defined $isbn, 'NormalizeISBN returns undef when converting to ISBN10 an ISBN starting with 979 (bug 13167)'); - - @isbns = GetVariationsOfISBNs('abc'); - is(@isbns == 1 && $isbns[0] eq 'abc', 1, 'The unaltered version should be returned if invalid'); - - is( C4::Koha::GetNormalizedISBN('9780062059994 (hardcover bdg.) | 0062059998 (hardcover bdg.)'), '0062059998', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780385753067 (trade) | 0385753063 (trade) | 9780385753074 (lib. bdg.) | 0385753071 (lib. bdg.)'), '0385753063', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9781432829162 (hardcover) | 1432829165 (hardcover)'), '1432829165', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780062063625 (hardcover) | 9780062063632 | 0062063634'), '0062063626', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780062059932 (hardback)'), '0062059939', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780316370318 (hardback) | 9780316376266 (special edition hardcover) | 9780316405454 (international paperback edition)'), '0316370312', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9781595148032 (hbk.) | 1595148035 (hbk.)') , '1595148035', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780062349859 | 0062349856 | 9780062391308 | 0062391305'), '0062349856', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9781250075345 (hardcover) | 1250075343 (hardcover) | 9781250049872 (trade pbk.) | 1250049873 (trade pbk.)'), '1250075343', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9781250067128 | 125006712X'), '125006712X', 'Test GetNormalizedISBN' ); - is( C4::Koha::GetNormalizedISBN('9780373211463 | 0373211465'), '0373211465', 'Test GetNormalizedISBN' ); - - is( C4::Koha::GetNormalizedUPC(), undef, 'GetNormalizedUPC should return undef if no record is passed' ); - is( C4::Koha::GetNormalizedISBN(), undef, 'GetNormalizedISBN should return undef if no record and no isbn are passed' ); - is( C4::Koha::GetNormalizedEAN(), undef, 'GetNormalizedEAN should return undef if no record and no isbn are passed' ); - is( C4::Koha::GetNormalizedOCLCNumber(), undef, 'GetNormalizedOCLCNumber should return undef if no record and no isbn are passed' ); -}; - -subtest 'issn stuff' => sub { - plan tests => 7; - - is(C4::Koha::NormalizeISSN({ issn => '0024-9319', strip_hyphen => 1 }), '00249319', 'Test NormalizeISSN with all features enabled' ); - is(C4::Koha::NormalizeISSN({ issn => '0024-9319', strip_hyphen => 0 }), '0024-9319', 'Test NormalizeISSN with all features enabled' ); - - my @issns = qw/ 0024-9319 00249319 /; - is( join('|', @issns), join('|', GetVariationsOfISSN('0024-9319')), 'GetVariationsOfISSN returns all variations' ); - is( join('|', @issns), join('|', GetVariationsOfISSNs('0024-9319')), 'GetVariationsOfISSNs returns all variations' ); - - my $issn; - eval { - $issn = C4::Koha::NormalizeISSN({ issn => '1234-5678', strip_hyphen => 1 }); - }; - ok($@ eq '', 'NormalizeISSN does not throw exception when parsing invalid ISSN'); - - @issns = GetVariationsOfISSNs('abc'); - is($issns[0], 'abc', 'Original ISSN passed through even if invalid'); - is(scalar(@issns), 1, 'zero additional variations returned of invalid ISSN'); -}; - -subtest 'getFacets() tests' => sub { - plan tests => 4; - - my $count = 1; - my $library_module = Test::MockModule->new('Koha::Libraries'); - $library_module->mock( 'count', sub { return $count } ); - - is ( Koha::Libraries->search->count, 1, 'There should be only 1 library (singleBranchMode on)' ); - my $facets = C4::Koha::getFacets(); - is( - scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), - 1, - 'location facet present with singleBranchMode on (bug 10078)' - ); - - $count = 3; # more libraries.. - is ( Koha::Libraries->search->count, 3, 'There should be more than 1 library (singleBranchMode off)' ); - - $facets = C4::Koha::getFacets(); - is( - scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), - 1, - 'location facet present with singleBranchMode off (bug 10078)' - ); -}; diff --git a/t/db_dependent/Koha.t b/t/db_dependent/Koha.t index f57d09588e..f802b5d972 100755 --- a/t/db_dependent/Koha.t +++ b/t/db_dependent/Koha.t @@ -4,7 +4,8 @@ # It requires a working Koha database with the sample data use Modern::Perl; -use Test::More tests => 5; +use Test::More tests => 6; +use Test::MockModule; use Test::Warn; use Test::Deep; @@ -14,10 +15,13 @@ use C4::Context; use Koha::Database; use Koha::AuthorisedValue; use Koha::AuthorisedValueCategories; +use Koha::Libraries; BEGIN { - use_ok('C4::Koha', qw( GetAuthorisedValues GetItemTypesCategorized xml_escape )); - use_ok('C4::Members'); + use_ok( + 'C4::Koha', + qw( GetAuthorisedValues GetItemTypesCategorized xml_escape GetVariationsOfISBN GetVariationsOfISBNs GetVariationsOfISSN GetVariationsOfISSNs ) + ); } my $schema = Koha::Database->new->schema; @@ -155,32 +159,182 @@ subtest 'Authorized Values Tests' => sub { }; -subtest 'ISBN tests' => sub { - plan tests => 6; +subtest 'isbn tests' => sub { + plan tests => 29; my $isbn13 = "9780330356473"; my $isbn13D = "978-0-330-35647-3"; my $isbn10 = "033035647X"; my $isbn10D = "0-330-35647-X"; - is( xml_escape(undef), '', - 'xml_escape() returns empty string on undef input' ); + + my $undef = undef; + is( xml_escape($undef), '', 'xml_escape() returns empty string on undef input' ); my $str = q{'"&<>'}; + is( xml_escape($str), ''"&<>'', 'xml_escape() works as expected' ); + is( $str, q{'"&<>'}, '... and does not change input in place' ); + + is( C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens' ); + is( C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical' ); + is( C4::Koha::_isbn_cleanup('978-0-321-49694-2'), '0321496949', '_isbn_cleanup converts ISBN-13 to ISBN-10' ); + + is( + C4::Koha::NormalizeISBN( { isbn => '978-0-321-49694-2 (pbk.)', format => 'ISBN-10', strip_hyphens => 1 } ), + '0321496949', 'Test NormalizeISBN with all features enabled' + ); + + my @isbns = qw/ 978-0-321-49694-2 0-321-49694-9 978-0-321-49694-2 0321496949 9780321496942/; + is( + join( '|', @isbns ), join( '|', GetVariationsOfISBN('978-0-321-49694-2 (pbk.)') ), + 'GetVariationsOfISBN returns all variations' + ); + + is( + join( '|', @isbns ), join( '|', GetVariationsOfISBNs('978-0-321-49694-2 (pbk.)') ), + 'GetVariationsOfISBNs returns all variations' + ); + + my $isbn; + eval { + $isbn = C4::Koha::NormalizeISBN( + { isbn => '0788893777 (2 DVD 45th ed)', format => 'ISBN-10', strip_hyphens => 1 } ); + }; + ok( $@ eq '', 'NormalizeISBN does not throw exception when parsing invalid ISBN (bug 12243)' ); + $isbn = C4::Koha::NormalizeISBN( + { isbn => '0788893777 (2 DVD 45th ed)', format => 'ISBN-10', strip_hyphens => 1, return_invalid => 1 } ); + is( + $isbn, '0788893777 (2 DVD 45th ed)', + 'NormalizeISBN returns original string when converting to ISBN10 an ISBN starting with 979 (bug 13167)' + ); + + eval { + $isbn = C4::Koha::NormalizeISBN( { isbn => '979-10-90085-00-8', format => 'ISBN-10', strip_hyphens => 1 } ); + }; + ok( + $@ eq '', + 'NormalizeISBN does not throw exception when converting to ISBN10 an ISBN starting with 979 (bug 13167)' + ); + ok( !defined $isbn, 'NormalizeISBN returns undef when converting to ISBN10 an ISBN starting with 979 (bug 13167)' ); + + @isbns = GetVariationsOfISBNs('abc'); + is( @isbns == 1 && $isbns[0] eq 'abc', 1, 'The unaltered version should be returned if invalid' ); + + is( + C4::Koha::GetNormalizedISBN('9780062059994 (hardcover bdg.) | 0062059998 (hardcover bdg.)'), '0062059998', + 'Test GetNormalizedISBN' + ); + is( + C4::Koha::GetNormalizedISBN( + '9780385753067 (trade) | 0385753063 (trade) | 9780385753074 (lib. bdg.) | 0385753071 (lib. bdg.)'), + '0385753063', + 'Test GetNormalizedISBN' + ); + is( + C4::Koha::GetNormalizedISBN('9781432829162 (hardcover) | 1432829165 (hardcover)'), '1432829165', + 'Test GetNormalizedISBN' + ); + is( + C4::Koha::GetNormalizedISBN('9780062063625 (hardcover) | 9780062063632 | 0062063634'), '0062063626', + 'Test GetNormalizedISBN' + ); + is( C4::Koha::GetNormalizedISBN('9780062059932 (hardback)'), '0062059939', 'Test GetNormalizedISBN' ); + is( + C4::Koha::GetNormalizedISBN( + '9780316370318 (hardback) | 9780316376266 (special edition hardcover) | 9780316405454 (international paperback edition)' + ), + '0316370312', + 'Test GetNormalizedISBN' + ); + is( + C4::Koha::GetNormalizedISBN('9781595148032 (hbk.) | 1595148035 (hbk.)'), '1595148035', + 'Test GetNormalizedISBN' + ); is( - xml_escape($str), - ''"&<>'', - 'xml_escape() works as expected' + C4::Koha::GetNormalizedISBN('9780062349859 | 0062349856 | 9780062391308 | 0062391305'), '0062349856', + 'Test GetNormalizedISBN' ); - is( $str, q{'"&<>'}, '... and does not change input in place' ); - is( C4::Koha::_isbn_cleanup('0-590-35340-3'), - '0590353403', '_isbn_cleanup removes hyphens' ); - is( C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), - '0590353403', '_isbn_cleanup removes parenthetical' ); - is( C4::Koha::_isbn_cleanup('978-0-321-49694-2'), - '0321496949', '_isbn_cleanup converts ISBN-13 to ISBN-10' ); + is( + C4::Koha::GetNormalizedISBN( + '9781250075345 (hardcover) | 1250075343 (hardcover) | 9781250049872 (trade pbk.) | 1250049873 (trade pbk.)' + ), + '1250075343', + 'Test GetNormalizedISBN' + ); + is( C4::Koha::GetNormalizedISBN('9781250067128 | 125006712X'), '125006712X', 'Test GetNormalizedISBN' ); + is( C4::Koha::GetNormalizedISBN('9780373211463 | 0373211465'), '0373211465', 'Test GetNormalizedISBN' ); + is( C4::Koha::GetNormalizedUPC(), undef, 'GetNormalizedUPC should return undef if no record is passed' ); + is( + C4::Koha::GetNormalizedISBN(), undef, + 'GetNormalizedISBN should return undef if no record and no isbn are passed' + ); + is( + C4::Koha::GetNormalizedEAN(), undef, + 'GetNormalizedEAN should return undef if no record and no isbn are passed' + ); + is( + C4::Koha::GetNormalizedOCLCNumber(), undef, + 'GetNormalizedOCLCNumber should return undef if no record and no isbn are passed' + ); +}; + +subtest 'issn stuff' => sub { + plan tests => 7; + + is( + C4::Koha::NormalizeISSN( { issn => '0024-9319', strip_hyphen => 1 } ), '00249319', + 'Test NormalizeISSN with all features enabled' + ); + is( + C4::Koha::NormalizeISSN( { issn => '0024-9319', strip_hyphen => 0 } ), '0024-9319', + 'Test NormalizeISSN with all features enabled' + ); + + my @issns = qw/ 0024-9319 00249319 /; + is( + join( '|', @issns ), join( '|', GetVariationsOfISSN('0024-9319') ), + 'GetVariationsOfISSN returns all variations' + ); + is( + join( '|', @issns ), join( '|', GetVariationsOfISSNs('0024-9319') ), + 'GetVariationsOfISSNs returns all variations' + ); + + my $issn; + eval { $issn = C4::Koha::NormalizeISSN( { issn => '1234-5678', strip_hyphen => 1 } ); }; + ok( $@ eq '', 'NormalizeISSN does not throw exception when parsing invalid ISSN' ); + + @issns = GetVariationsOfISSNs('abc'); + is( $issns[0], 'abc', 'Original ISSN passed through even if invalid' ); + is( scalar(@issns), 1, 'zero additional variations returned of invalid ISSN' ); +}; + +subtest 'getFacets() tests' => sub { + plan tests => 4; + + my $count = 1; + my $library_module = Test::MockModule->new('Koha::Libraries'); + $library_module->mock( 'count', sub { return $count } ); + + is( Koha::Libraries->search->count, 1, 'There should be only 1 library (singleBranchMode on)' ); + my $facets = C4::Koha::getFacets(); + is( + scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), + 1, + 'location facet present with singleBranchMode on (bug 10078)' + ); + + $count = 3; # more libraries.. + is( Koha::Libraries->search->count, 3, 'There should be more than 1 library (singleBranchMode off)' ); + + $facets = C4::Koha::getFacets(); + is( + scalar( grep { defined $_->{idx} && $_->{idx} eq 'location' } @$facets ), + 1, + 'location facet present with singleBranchMode off (bug 10078)' + ); }; -subtest 'GetItemTypesCategorized test' => sub{ +subtest 'GetItemTypesCategorized test' => sub { plan tests => 9; my $avc = Koha::AuthorisedValueCategories->find('ITEMTYPECAT'); -- 2.39.5