@@ -, +, @@ --- t/db_dependent/Koha/Z3950Responder/GenericSession.t | 12 ++++++++---- t/db_dependent/Koha/Z3950Responder/Session2.t | 8 +++++++- t/db_dependent/Koha/Z3950Responder/config.xml | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) --- a/t/db_dependent/Koha/Z3950Responder/GenericSession.t +++ a/t/db_dependent/Koha/Z3950Responder/GenericSession.t @@ -7,6 +7,7 @@ use Test::WWW::Mechanize; use t::lib::Mocks qw(mock_preference); use File::Basename; +use File::Copy; use XML::LibXML; use YAML; use ZOOM; @@ -81,10 +82,13 @@ subtest 'test_search' => sub { $child = fork(); if ($child == 0) { my $config_dir = dirname(__FILE__) . '/'; + # Copy pqf.properties from etc/z3950 + copy($config_dir . '../../../../etc/z3950/pqf.properties', $config_dir . 'pqf.properties') || die "Copying pqf.properties failed: $!"; my $z = Koha::Z3950Responder->new( { config_dir => $config_dir }); $z->start(); + unlink($config_dir . 'pqf.properties'); exit; } sleep(1); @@ -116,21 +120,21 @@ subtest 'test_search' => sub { # SRU protocol tests my $base = 'http://localhost:42111'; - my $ns = 'http://docs.oasis-open.org/ns/search-ws/sruResponse'; + my $ns = 'http://www.loc.gov/zing/srw/'; my $marc_ns = 'http://www.loc.gov/MARC21/slim'; my $agent = Test::WWW::Mechanize->new( autocheck => 1 ); - $agent->get_ok("$base", 'Retrieve explain response'); + $agent->get_ok("$base?version=1.1", 'Retrieve explain response'); my $dom = XML::LibXML->load_xml(string => $agent->content()); my @nodes = $dom->getElementsByTagNameNS($ns, 'explainResponse'); is(scalar(@nodes), 1, 'explainResponse returned'); - $agent->get_ok("$base/biblios?operation=searchRetrieve&recordSchema=marcxml&maximumRecords=10&query=", 'Try bad search query'); + $agent->get_ok("$base/biblios?operation=searchRetrieve&recordSchema=marcxml&version=1.1&maximumRecords=10&query=", 'Try bad search query'); $dom = XML::LibXML->load_xml(string => $agent->content()); @nodes = $dom->getElementsByTagNameNS($ns, 'diagnostics'); is(scalar(@nodes), 1, 'diagnostics returned for bad query'); - $agent->get_ok("$base/biblios?operation=searchRetrieve&recordSchema=marcxml&maximumRecords=10&query=(dc.author%3dauthor AND (dc.title%3d\"title(s)\" OR dc.title%3danother))", 'Retrieve search results'); + $agent->get_ok("$base/biblios?operation=searchRetrieve&recordSchema=marcxml&version=1.1&maximumRecords=10&query=(dc.author%3dauthor AND (dc.title%3d\"title(s)\" OR dc.title%3danother))", 'Retrieve search results'); $dom = XML::LibXML->load_xml(string => $agent->content()); @nodes = $dom->getElementsByTagNameNS($ns, 'searchRetrieveResponse'); is(scalar(@nodes), 1, 'searchRetrieveResponse returned'); --- a/t/db_dependent/Koha/Z3950Responder/Session2.t +++ a/t/db_dependent/Koha/Z3950Responder/Session2.t @@ -5,6 +5,8 @@ use Test::More tests => 3; use t::lib::TestBuilder; use C4::Items; +use Koha::Caches; + BEGIN { use_ok('Koha::Z3950Responder'); use_ok('Koha::Z3950Responder::Session'); @@ -20,7 +22,7 @@ subtest 'add_item_status' => sub { plan tests => 2; # This time we are sustituting some values - $builder->schema->resultset( 'AuthorisedValue' )->delete_all; + $builder->schema->resultset( 'AuthorisedValue' )->delete_all(); $builder->build({ source => 'AuthorisedValue', value => { @@ -37,6 +39,10 @@ subtest 'add_item_status' => sub { lib => "Borked completely" } }); + + # Clear the cache to make sure the above values take effect + my $cache = Koha::Caches->get_instance(); + $cache->flush_all(); ## FIRST ITEM HAS ALL THE STATUSES ## my $item_1 = $builder->build({ --- a/t/db_dependent/Koha/Z3950Responder/config.xml +++ a/t/db_dependent/Koha/Z3950Responder/config.xml @@ -1,7 +1,7 @@ tcp:localhost:42111 - ../../../../etc/z3950/pqf.properties + pqf.properties --