From fbc8508e11ce80343d1052e5b05ee0e922c5bad7 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Sat, 30 Dec 2017 15:46:15 +0100 Subject: [PATCH] LUCENE-8010: Remove assumptions about how the similarity orders hits from FastVectorHighlighterTest. --- .../search/vectorhighlight/FastVectorHighlighterTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java index 0683e8def39..ddcce5ae877 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java @@ -324,7 +324,9 @@ public class FastVectorHighlighterTest extends LuceneTestCase { public void testCommonTermsQueryHighlight() throws IOException { Directory dir = newDirectory(); - IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET))); + IndexWriter writer = new IndexWriter(dir, + newIndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET)) + .setMergePolicy(newLogMergePolicy())); // don't reorder doc ids FieldType type = new FieldType(TextField.TYPE_STORED); type.setStoreTermVectorOffsets(true); type.setStoreTermVectorPositions(true); @@ -353,11 +355,11 @@ public class FastVectorHighlighterTest extends LuceneTestCase { TopDocs hits = searcher.search(query, 10); assertEquals(2, hits.totalHits); FieldQuery fieldQuery = highlighter.getFieldQuery(query, reader); - String[] bestFragments = highlighter.getBestFragments(fieldQuery, reader, hits.scoreDocs[0].doc, "field", 1000, 1); + String[] bestFragments = highlighter.getBestFragments(fieldQuery, reader, 1, "field", 1000, 1); assertEquals("This piece of text refers to Kennedy at the beginning then has a longer piece of text that is very long in the middle and finally ends with another reference to Kennedy", bestFragments[0]); fieldQuery = highlighter.getFieldQuery(query, reader); - bestFragments = highlighter.getBestFragments(fieldQuery, reader, hits.scoreDocs[1].doc, "field", 1000, 1); + bestFragments = highlighter.getBestFragments(fieldQuery, reader, 0, "field", 1000, 1); assertEquals("Hello this is a piece of text that is very long and contains too much preamble and the meat is really here which says kennedy has been shot", bestFragments[0]); reader.close();