From ebe1a305a9e8fd75c0b3206d0054d23656944b45 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 6 Jul 2016 21:37:21 -0400 Subject: [PATCH] Bug 16868: Silence error t/db_dependent/Linker_FirstMatch.t When the auth_header table has records which exclude 1xx and 2xx tags, the $bibfield doesn't match anything. This in turn sets it to undef, which triggers an error on the next line killing the test. This was completely refactored to provide the data necessary for the tests to pass, and to be more comprehensive (both MARC and UNIMARC are tested). The tests are then run. TEST PLAN --------- 1) back up DB 2) DELETE FROM auth_header; 3) SOURCE auth_header.sql; -- the provided file 4) prove t/db_dependent/Linker_FirstMatch.t -- should barf before running all the tests 5) apply all patches 6) prove t/db_dependent/Linker_FirstMatch.t -- should work happy 7) run koha qa test tools 8) restore your backup --- t/db_dependent/Linker_FirstMatch.t | 135 ++++++++++++++++++++++++++++++------- 1 file changed, 110 insertions(+), 25 deletions(-) diff --git a/t/db_dependent/Linker_FirstMatch.t b/t/db_dependent/Linker_FirstMatch.t index 66c03ba..651a629 100755 --- a/t/db_dependent/Linker_FirstMatch.t +++ b/t/db_dependent/Linker_FirstMatch.t @@ -1,31 +1,81 @@ #!/usr/bin/perl # -# This Koha test module is a stub! -# Add more tests here!!! +# This file is part of Koha. +# +# Copyright (C) 2011 Jared Camins-Esakov +# Copyright (C) 2016 Mark Tompsett +# +# 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 strict; -use warnings; +use Modern::Perl; use Test::More tests => 3; -use C4::Context; -use C4::Heading; + use MARC::Record; use MARC::Field; +use MARC::File::XML; +use C4::Heading; use C4::Linker::FirstMatch; +use Test::MockModule; +use t::lib::Database; +use t::lib::Mocks qw( mock_preference ); +use t::lib::TestBuilder; BEGIN { use_ok('C4::Linker'); } -my $dbh = C4::Context->dbh; - -my $query = "SELECT authid, marc FROM auth_header LIMIT 1;"; -my $sth = $dbh->prepare($query); -$sth->execute(); -my ($authid, $marc) = $sth->fetchrow_array(); -SKIP: { - skip "No authorities", 2 unless defined $authid; - my $linker = C4::Linker::FirstMatch->new(); - my $auth = MARC::Record->new_from_usmarc($marc); + +# This will make DBI and DBIx play friendly, +# plus roll back automatically. +my $dbh = t::lib::Database->dbh; + +# Set up just a single authority record to find and use. +my $builder = t::lib::TestBuilder->new(); +$builder->delete({ source => 'AuthHeader' }); + +my $auth_header = $builder->build({ + source => 'AuthHeader' +}); +my $authid = $auth_header->{authid}; + +# Mock C4::Heading->authorities() so tests will all pass. +my $mock_heading = Test::MockModule->new('C4::Heading'); +$mock_heading->mock( authorities => sub { return [{ authid => $authid }]; } ); + +# Run tests for both logic cases (UNIMARC / non-UNIMARC) +subtest 'MARC21' => sub { + plan tests => 2; + t::lib::Mocks::mock_preference('marcflavour', 'MARC21'); + run_tests(); +}; + +subtest 'UNIMARC' => sub { + plan tests => 2; + t::lib::Mocks::mock_preference('marcflavour', 'UNIMARC'); + run_tests(); +}; + +sub run_tests { + + # Set the data up to match nicely. + my $fake_xml = generateFakeMarcXML($authid); + my $auth = MARC::File::XML->decode( $fake_xml ); + my $fake_marc = $auth->as_usmarc(); + my $sth = $dbh->prepare( q{UPDATE auth_header SET marc=?,marcxml=? WHERE authid=?} ); + $sth->execute( $fake_marc, $fake_xml, $authid ); + + # Find a particular series field. my $fieldmatch; if (C4::Context->preference('MARCFlavour') eq 'UNIMARC') { $fieldmatch = '2..'; @@ -33,20 +83,55 @@ SKIP: { $fieldmatch = '1..'; } my $bibfield = $auth->field($fieldmatch); + + # Convert it to a 6xx series field. my $tag = $bibfield->tag(); - $tag =~ s/^./6/; - $bibfield->update(tag => $tag); - my $heading; - ok(defined ($heading = C4::Heading->new_from_bib_field($bibfield, '')), "Creating heading from bib field"); + my $new_tag = $tag; + $new_tag =~ s/^./6/; + my @subfields = $bibfield->subfields(); + my $new_bibfield = MARC::Field->new($new_tag,$bibfield->indicator(1),$bibfield->indicator(2),@subfields); - # If Zebra is not running, or authorities have not been indexed, test 3 - # will fail. Skip it if we are unable to retrieve a list of headings from - # Zebra. - my @authids = $heading->authorities(1); - skip "Unable to search Zebra", 1 unless $#authids > 0; + # Can we build a heading from it? + my $heading; + ok(defined ($heading = C4::Heading->new_from_bib_field($new_bibfield, '')), "Creating heading from bib field"); + # Now test to see if C4::Linker can find it. my $authmatch; my $fuzzy; + my $linker = C4::Linker::FirstMatch->new(); ($authmatch, $fuzzy) = $linker->get_link($heading); is($authmatch, $authid, "Matched existing heading"); + return; +} + +sub generateFakeMarcXML { + my ($auth_id) = @_; + my $marc_xml; + + $marc_xml = << 'BLOCK'; + + + + 01954cz a2200289n 4500 + +BLOCK + $marc_xml .= $auth_id . "\n"; + if (C4::Context->preference('MARCFlavour') eq 'UNIMARC') { + $marc_xml .= ' '; + } else { + $marc_xml .= ' '; + } + + $marc_xml .= "\n"; + $marc_xml .= << 'DATA'; + Geisel, Theodor Seuss, + 1904-1991 + +DATA + + $marc_xml .= "\n"; + return $marc_xml; } -- 2.1.4