You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/03/22 09:17:41 UTC
svn commit: r1580180 -
/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
Author: mikemccand
Date: Sat Mar 22 08:17:41 2014
New Revision: 1580180
URL: http://svn.apache.org/r1580180
Log:
LUCENE-5489: fix test bug
Modified:
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java?rev=1580180&r1=1580179&r2=1580180&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java Sat Mar 22 08:17:41 2014
@@ -32,6 +32,15 @@ import org.apache.lucene.util.LuceneTest
public class TestQueryRescorer extends LuceneTestCase {
+ private IndexSearcher getSearcher(IndexReader r) {
+ IndexSearcher searcher = newSearcher(r);
+
+ // We rely on more tokens = lower score:
+ searcher.setSimilarity(new DefaultSimilarity());
+
+ return searcher;
+ }
+
public void testBasic() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
@@ -52,10 +61,7 @@ public class TestQueryRescorer extends L
BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("field", "wizard")), Occur.SHOULD);
bq.add(new TermQuery(new Term("field", "oz")), Occur.SHOULD);
- IndexSearcher searcher = newSearcher(r);
-
- // We rely on more tokens = lower score:
- searcher.setSimilarity(new DefaultSimilarity());
+ IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq, 10);
assertEquals(2, hits.totalHits);
@@ -111,7 +117,7 @@ public class TestQueryRescorer extends L
BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("field", "wizard")), Occur.SHOULD);
bq.add(new TermQuery(new Term("field", "oz")), Occur.SHOULD);
- IndexSearcher searcher = newSearcher(r);
+ IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq, 10);
assertEquals(2, hits.totalHits);
@@ -165,7 +171,7 @@ public class TestQueryRescorer extends L
BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("field", "wizard")), Occur.SHOULD);
bq.add(new TermQuery(new Term("field", "oz")), Occur.SHOULD);
- IndexSearcher searcher = newSearcher(r);
+ IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq, 10);
assertEquals(2, hits.totalHits);
@@ -243,7 +249,7 @@ public class TestQueryRescorer extends L
BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("field", "wizard")), Occur.SHOULD);
bq.add(new TermQuery(new Term("field", "oz")), Occur.SHOULD);
- IndexSearcher searcher = newSearcher(r);
+ IndexSearcher searcher = getSearcher(r);
TopDocs hits = searcher.search(bq, 10);
assertEquals(2, hits.totalHits);