From a6afe29fc610f67624898a2e1499e9c9038468f0 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Wed, 13 Apr 2016 21:20:36 +0000 Subject: [PATCH] Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t --- ...Search.t => Koha_SearchEngine_Elasticsearch_Search.t} | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) rename t/{Koha_ElasticSearch_Search.t => Koha_SearchEngine_Elasticsearch_Search.t} (59%) diff --git a/t/Koha_ElasticSearch_Search.t b/t/Koha_SearchEngine_Elasticsearch_Search.t similarity index 59% rename from t/Koha_ElasticSearch_Search.t rename to t/Koha_SearchEngine_Elasticsearch_Search.t index 081b162..402a881 100644 --- a/t/Koha_ElasticSearch_Search.t +++ b/t/Koha_SearchEngine_Elasticsearch_Search.t @@ -1,7 +1,7 @@ # #=============================================================================== # -# FILE: Koha_ElasticSearch_Search.t +# FILE: Koha_SearchEngine_Elasticsearch_Search.t # # DESCRIPTION: # @@ -19,11 +19,14 @@ use strict; use warnings; use Test::More tests => 5; # last test to print +use Koha::SearchEngine::Elasticsearch::QueryBuilder; -use_ok('Koha::ElasticSearch::Search'); +my $builder = Koha::SearchEngine::Elasticsearch::QueryBuilder->new( { index => 'mydb' } ); + +use_ok('Koha::SearchEngine::Elasticsearch::Search'); ok( - my $searcher = Koha::ElasticSearch::Search->new( + my $searcher = Koha::SearchEngine::Elasticsearch::Search->new( { 'nodes' => ['localhost:9200'], 'index' => 'mydb' } ), 'Creating a Koha::ElasticSearch::Search object' @@ -31,8 +34,7 @@ ok( is( $searcher->index, 'mydb', 'Testing basic accessor' ); -ok( $searcher->connect, 'Connect to ElasticSearch server' ); -ok( my $results = $searcher->search( { record => 'easy' } ), 'Do a search ' ); +ok( my $query = $builder->build_query('easy'), 'Build a search query'); + +ok( my $results = $searcher->search( $query) , 'Do a search ' ); -ok( my $marcresults = $searcher->marc_search( { record => 'Fish' } ), - 'Do a marc search' ); -- 2.1.4