Bug 16660: (followup) Unit tests

This patch adds unit tests for the introduced changes in build_query_compat. It removes a warning too. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
KohaSuomi · Sep 4, 2018 · 8bf20f0 · 8bf20f0
1 parent eddb460
commit 8bf20f0
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 2 deletions.
diff --git a/Koha/SearchEngine/Zebra/QueryBuilder.pm b/Koha/SearchEngine/Zebra/QueryBuilder.pm
@@ -44,7 +44,7 @@ sub build_query_compat {
     #
     # add OPAC suppression - requires at least one item indexed with Suppress
     if ($params->{suppress}) {
-        if ( $query_type eq 'pqf' ) {
+        if ( defined $query_type and $query_type eq 'pqf' ) {
             #$query = "($query) && -(suppress:1)"; #QP syntax
             $query = '@not '.$query.' @attr 14=1 @attr 1=9011 1'; #PQF syntax
         } else {

diff --git a/t/Koha/SearchEngine/Zebra/QueryBuilder.t b/t/Koha/SearchEngine/Zebra/QueryBuilder.t
@@ -0,0 +1,78 @@
+#!/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 <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+
+use Test::More tests => 3;
+use Test::MockModule;
+
+use_ok('Koha::SearchEngine::Zebra::QueryBuilder');
+
+subtest 'build_authorities_query' => sub {
+    plan tests => 2;
+
+    my @test_search = (
+        ['mainmainentry'], ['and'], [''], ['contains'], ['any'], '',
+        'HeadingAsc'
+    );
+    my $expected_result = {
+        marclist     => ['mainmainentry'],
+        and_or       => ['and'],
+        excluding    => [''],
+        operator     => ['contains'],
+        value        => ['any'],
+        authtypecode => '',
+        orderby      => 'HeadingAsc',
+    };
+    my $built_search =
+      Koha::SearchEngine::Zebra::QueryBuilder->build_authorities_query( @test_search );
+    is_deeply(
+        $built_search, $expected_result,
+        "We are simply hashifying our array of refs/values, should otherwise not be altered"
+    );
+    $expected_result->{value} = ['"any"'];
+    $test_search[4] = ['"any"'];
+    $built_search =
+      Koha::SearchEngine::Zebra::QueryBuilder->build_authorities_query( @test_search );
+    is_deeply(
+        $built_search, $expected_result,
+        "The same should hold true if the search contains double quotes which will be escaped during searching by search_auth_compat subroutine"
+    );
+};
+
+subtest 'build_query_compat() tests' => sub {
+
+    plan tests => 4;
+
+    my $search = Test::MockModule->new('C4::Search');
+    $search->mock( 'buildQuery', sub { return ( 'error', 'query', 'simple_query', 'query_cgi', 'query_desc', 'limit', 'limit_cgi', 'limit_desc', 'query_type' ) } );
+    my $qb = Koha::SearchEngine::Zebra::QueryBuilder->new();
+    my $query;
+
+    ( undef, $query ) = $qb->build_query_compat( undef, undef, undef, undef, undef, undef, undef, { suppress => 1 } );
+    is( $query, '(query) not Suppress=1', 'Suppress part of the query added correctly');
+
+    ( undef, $query ) = $qb->build_query_compat( undef, undef, undef, undef, undef, undef, undef, { suppress => 0 } );
+    is( $query, 'query', 'Suppress part of the query not added');
+
+    $search->mock( 'buildQuery', sub { return ( 'error', 'query', 'simple_query', 'query_cgi', 'query_desc', 'limit', 'limit_cgi', 'limit_desc', 'pqf' ) } );
+    ( undef, $query ) = $qb->build_query_compat( undef, undef, undef, undef, undef, undef, undef, { suppress => 1 } );
+    is( $query, '@not query @attr 14=1 @attr 1=9011 1', 'Suppress part of the query added correctly (PQF)');
+
+    ( undef, $query ) = $qb->build_query_compat( undef, undef, undef, undef, undef, undef, undef, { suppress => 0 } );
+    is( $query, 'query', 'Suppress part of the query not added (PQF)');
+};
diff --git a/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t b/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
@@ -81,7 +81,7 @@ subtest 'json2marc' => sub {
 };
 
 subtest 'build_query tests' => sub {
-    plan tests => 16;
+    plan tests => 18;
 
     t::lib::Mocks::mock_preference('DisplayLibraryFacets','both');
     my $query = $builder->build_query();
@@ -178,6 +178,20 @@ subtest 'build_query tests' => sub {
         '(title:"donald duck")',
         "query of specific field is not truncated when surrouned by quotes"
     );
+
+    ( undef, $query ) = $builder->build_query_compat( undef, ['title:"donald duck"'], undef, undef, undef, undef, undef, { suppress => 1 } );
+    is(
+        $query->{query}{query_string}{query},
+        '(title:"donald duck") AND suppress:0',
+        "query of specific field is added AND suppress:0"
+    );
+
+    ( undef, $query ) = $builder->build_query_compat( undef, ['title:"donald duck"'], undef, undef, undef, undef, undef, { suppress => 0 } );
+    is(
+        $query->{query}{query_string}{query},
+        '(title:"donald duck")',
+        "query of specific field is not added AND suppress:0"
+    );
 };
 
 1;