Bug 33406: (QA follow-up) Adjust tests and tidy
Rather than test that nothing is returned, we want to test that the terms are filtered as expected. This also avoids the possibility of the tests failing in a db where there is a record for Donald Duck Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> (cherry picked from commit3d7b60dc90
) Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> (cherry picked from commit4cc4120322
) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
parent
778f022e8a
commit
2af1cb9d14
2 changed files with 9 additions and 14 deletions
|
@ -97,21 +97,15 @@ if ( $op eq "do_search" ) {
|
|||
}
|
||||
);
|
||||
|
||||
my $builder = Koha::SearchEngine::QueryBuilder->new(
|
||||
{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
||||
my $searcher = Koha::SearchEngine::Search->new(
|
||||
{ index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
||||
my $builder = Koha::SearchEngine::QueryBuilder->new( { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
||||
my $searcher = Koha::SearchEngine::Search->new( { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
|
||||
|
||||
my $search_query = $builder->build_authorities_query_compat(
|
||||
[$marclist], [$and_or], [$excluding], [$operator],
|
||||
[$value], $authtypecode, $orderby
|
||||
);
|
||||
my ( $results, $total );
|
||||
eval {
|
||||
( $results, $total ) = $searcher->search_auth_compat(
|
||||
$search_query, $offset, $resultsperpage
|
||||
);
|
||||
};
|
||||
eval { ( $results, $total ) = $searcher->search_auth_compat( $search_query, $offset, $resultsperpage ); };
|
||||
if ($@) {
|
||||
my $query_error = q{};
|
||||
$query_error .= $@ if $@;
|
||||
|
|
|
@ -45,12 +45,13 @@ subtest 'search_auth_compat' => sub {
|
|||
|
||||
my $search_query = $builder->build_authorities_query_compat(
|
||||
['mainmainentry'], ['and'], [''], ['contains'],
|
||||
['Donald - Duck'], '', 'HeadingAsc'
|
||||
['Donald - ^ \ ~ + Duck'], '', 'HeadingAsc'
|
||||
);
|
||||
|
||||
my ( $bad_results, undef ) = $search->search_auth_compat( $search_query, 0, 20, undef );
|
||||
|
||||
is( @$bad_results[0], undef, 'We expect no record because it doesnt exist' );
|
||||
is(
|
||||
$search_query->{query}->{bool}->{must}->[0]->{query_string}->{query}, '(Donald*) AND (Duck*)',
|
||||
"Reserved characters -, ^, \\, ~, + have been removed from search query"
|
||||
);
|
||||
|
||||
my $module = Test::MockModule->new('Koha::SearchEngine::Elasticsearch::Search');
|
||||
$module->mock( 'count_auth_use', sub { return 1 } );
|
||||
|
|
Loading…
Reference in a new issue