Skip to content

Commit 1943b3b

Browse files
committed
#819 Fix multiple rescore queries tests
1 parent b6c4719 commit 1943b3b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

lib/Elastica/Query.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ public function setSuggest(Suggest $suggest)
401401
/**
402402
* Add a Rescore
403403
*
404-
* @param \Elastica\Rescore\AbstractRescore $rescore suggestion object
404+
* @param mixed $rescore suggestion object
405405
* @return $this
406406
*/
407407
public function setRescore($rescore)

test/lib/Elastica/Test/Query/RescoreTest.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,19 @@ public function testMultipleQueries()
146146
$query = new Query();
147147
$mainQuery = new Match();
148148
$mainQuery = $mainQuery->setFieldQuery('test1', 'foo');
149+
149150
$secQuery1 = new Term();
150151
$secQuery1 = $secQuery1->setTerm('test2', 'bar', 1);
152+
$rescoreQuery1 = new QueryRescore();
153+
$rescoreQuery1->setRescoreQuery($secQuery1);
154+
151155
$secQuery2 = new Term();
152156
$secQuery2 = $secQuery2->setTerm('test2', 'tom', 2);
153-
$queryRescore = new QueryRescore(array($secQuery1, $secQuery2));
157+
$rescoreQuery2 = new QueryRescore();
158+
$rescoreQuery2->setRescoreQuery($secQuery2);
159+
154160
$query->setQuery($mainQuery);
155-
$query->setRescore($queryRescore);
161+
$query->setRescore(array($rescoreQuery1, $rescoreQuery2));
156162
$data = $query->toArray();
157163

158164
$expected = array(

0 commit comments

Comments
 (0)