Skip to content

Apache Lucene open-source search software

Make unified highlighter tests avoid mock random merge policy's document reordering (#12889)

Dawid Weissba81826951c1
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
index 54792a569f7..091af3595f1 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.uhighlight;
+import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import java.io.BufferedReader;
import java.io.IOException;
@@ -53,43 +54,17 @@ import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.util.automaton.Automata;
-import org.junit.After;
-import org.junit.Before;
-
-public class TestUnifiedHighlighter extends LuceneTestCase {
-
- private final FieldType
- fieldType; // for "body" generally, but not necessarily others. See constructor
-
- private MockAnalyzer indexAnalyzer;
- private Directory dir;
+public class TestUnifiedHighlighter extends UnifiedHighlighterTestBase {
@ParametersFactory
public static Iterable<Object[]> parameters() {
- return UHTestHelper.parametersFactoryList();
- }
-
- public TestUnifiedHighlighter(FieldType fieldType) {
- this.fieldType = fieldType;
- }
-
- @Before
- public void doBefore() throws IOException {
- indexAnalyzer =
- new MockAnalyzer(
- random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase
- dir = newDirectory();
+ return parametersFactoryList();
}
- @After
- public void doAfter() throws IOException {
- dir.close();
+ public TestUnifiedHighlighter(@Name("fieldType") FieldType fieldType) {
+ super(fieldType);
}
static Set<HighlightFlag> generateRandomHighlightFlags(EnumSet<HighlightFlag> requiredFlags) {
@@ -176,7 +151,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
//
public void testBasics() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -239,7 +214,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
int maxLength = 17;
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
final Field body = new Field("body", bodyText, fieldType);
@@ -269,7 +244,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
// simple test highlighting last word.
public void testHighlightLastWord() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -295,7 +270,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
// simple test with one sentence documents.
public void testOneSentence() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -324,7 +299,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
// simple test with multiple values that make a result longer than maxLength.
public void testMaxLengthWithMultivalue() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -355,10 +330,10 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testMultipleFields() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
- Field title = new Field("title", "", UHTestHelper.randomFieldType(random()));
+ Field title = new Field("title", "", randomFieldType(random()));
Document doc = new Document();
doc.add(body);
doc.add(title);
@@ -394,7 +369,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testMultipleTerms() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -428,7 +403,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testMultiplePassages() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -470,7 +445,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
+ "and Madhyamaka - Yogacara, the Epistemological tradition, and Tathagatagarbha - Tantric "
+ "Buddhism (Including China and Japan); Buddhism in Nepal and Tibet - Buddhism in South and "
+ "Southeast Asia, and - Buddhism in China, East Asia, and Japan.";
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
@@ -502,7 +477,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testHighlighterDefaultFlags() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document document = new Document();
document.add(new Field("body", "test body", fieldType));
iw.addDocument(document);
@@ -526,7 +501,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
+ "Curious George and the Firefighters is a story based on H. A. and Margret Rey’s "
+ "popular primate and painted in the original watercolor and charcoal style. "
+ "Firefighters are a famously brave lot, but can they withstand a visit from one curious monkey?";
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
@@ -558,7 +533,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
this.getClass().getResourceAsStream("CambridgeMA.utf8"), StandardCharsets.UTF_8));
String text = r.readLine();
r.close();
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
document.add(body);
@@ -586,7 +561,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testPassageRanking() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -614,7 +589,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testBooleanMustNot() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body =
new Field(
@@ -650,7 +625,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testHighlightAllText() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -682,7 +657,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testSpecificDocIDs() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -718,7 +693,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testCustomFieldValueSource() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -770,7 +745,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
/** Make sure highlighter returns first N sentences if there were no hits. */
public void testEmptyHighlights() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -801,7 +776,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
/** Not empty but nothing analyzes. Ensures we address null term-vectors. */
public void testNothingAnalyzes() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", " ", fieldType)); // just a space! (thus not empty)
@@ -835,7 +810,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
/** Make sure highlighter we can customize how emtpy highlight is returned. */
public void testCustomEmptyHighlights() throws Exception {
indexAnalyzer.setPositionIncrementGap(10);
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -869,7 +844,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
/** Make sure highlighter returns whole text when there are no hits and BreakIterator is null. */
public void testEmptyHighlightsWhole() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -904,7 +879,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
/** Make sure highlighter is OK with entirely missing field. */
public void testFieldIsMissing() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -934,7 +909,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testFieldIsJustSpace() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", " ", fieldType));
@@ -966,7 +941,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testFieldIsEmptyString() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", "", fieldType));
@@ -998,7 +973,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testMultipleDocs() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
int numDocs = atLeast(100);
for (int i = 0; i < numDocs; i++) {
@@ -1045,10 +1020,10 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testMultipleSnippetSizes() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
- Field title = new Field("title", "", UHTestHelper.randomFieldType(random()));
+ Field title = new Field("title", "", randomFieldType(random()));
Document doc = new Document();
doc.add(body);
doc.add(title);
@@ -1081,7 +1056,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testEncode() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -1112,7 +1087,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
// LUCENE-4906
public void testObjectFormatter() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -1160,7 +1135,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
private IndexReader indexSomeFields() throws IOException {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
FieldType ft = new FieldType();
ft.setIndexOptions(IndexOptions.NONE);
ft.setTokenized(false);
@@ -1551,11 +1526,11 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testNotReanalyzed() throws Exception {
- if (fieldType == UHTestHelper.reanalysisType) {
+ if (fieldType == reanalysisType) {
return; // we're testing the *other* cases
}
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -1589,7 +1564,7 @@ public class TestUnifiedHighlighter extends LuceneTestCase {
}
public void testUnknownQueryWithWeightMatches() throws IOException {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
index 4aabf26d45b..76193a8e62a 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java
@@ -61,48 +61,24 @@ import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.store.BaseDirectoryWrapper;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.UnicodeUtil;
-import org.junit.After;
-import org.junit.Before;
/** Some tests that highlight wildcard, fuzzy, etc queries. */
-public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
-
- final FieldType fieldType;
-
- BaseDirectoryWrapper dir;
- Analyzer indexAnalyzer;
+public class TestUnifiedHighlighterMTQ extends UnifiedHighlighterTestBase {
@ParametersFactory
public static Iterable<Object[]> parameters() {
- return UHTestHelper.parametersFactoryList();
+ return parametersFactoryList();
}
public TestUnifiedHighlighterMTQ(FieldType fieldType) {
- this.fieldType = fieldType;
- }
-
- @Before
- public void doBefore() throws IOException {
- dir = newDirectory();
- indexAnalyzer =
- new MockAnalyzer(
- random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase
- }
-
- @After
- public void doAfter() throws IOException {
- dir.close();
+ super(fieldType);
}
public void testWildcards() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -160,7 +136,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testOnePrefix() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -203,7 +179,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testOneRegexp() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -245,7 +221,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testFuzzy() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -305,7 +281,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testRanges() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -415,7 +391,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testWildcardInBoolean() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -459,7 +435,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testWildcardInFiltered() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -491,7 +467,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testWildcardInConstantScore() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -519,7 +495,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testWildcardInDisjunctionMax() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -549,7 +525,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testSpanWildcard() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -577,7 +553,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testSpanOr() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -607,7 +583,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testSpanNear() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -637,7 +613,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testSpanNot() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -667,7 +643,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testSpanPositionCheck() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -700,7 +676,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
* Runs a query with two MTQs and confirms the formatter can tell which query matched which hit.
*/
public void testWhichMTQMatched() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -800,7 +776,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
//
public void testWithMaxLen() throws IOException {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -833,7 +809,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testWithMaxLenAndMultipleWildcardMatches() throws IOException {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -871,7 +847,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
public void testTokenStreamIsClosed() throws Exception {
// note: test is a derivative of testWithMaxLen()
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -924,7 +900,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
try {
highlighter.highlight("body", query, topDocs, 2);
// don't even care what the results are; just want to test exception behavior
- if (fieldType == UHTestHelper.reanalysisType) {
+ if (fieldType == reanalysisType) {
fail("Expecting EXPECTED IOException");
}
} catch (Exception e) {
@@ -945,7 +921,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
/** Not empty but nothing analyzes. Ensures we address null term-vectors. */
public void testNothingAnalyzes() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", " ", fieldType)); // just a space! (thus not empty)
@@ -978,7 +954,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
public void testMultiSegment() throws Exception {
// If we incorrectly got the term vector from mis-matched global/leaf doc ID, this test may fail
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", "word aberration", fieldType));
@@ -1007,7 +983,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testPositionSensitiveWithWildcardDoesNotHighlight() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", "iterate insect ipswitch illinois indirect", fieldType));
doc.add(newTextField("id", "id", Field.Store.YES));
@@ -1044,7 +1020,7 @@ public class TestUnifiedHighlighterMTQ extends LuceneTestCase {
}
public void testCustomSpanQueryHighlighting() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(
new Field(
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
index 592c899cf6b..83ce335e5a9 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -40,16 +39,14 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.tests.analysis.MockAnalyzer;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.lucene.util.BytesRef;
-public class TestUnifiedHighlighterRanking extends LuceneTestCase {
+public class TestUnifiedHighlighterRanking extends UnifiedHighlighterTestBase {
- Analyzer indexAnalyzer;
-
- // note: all offset sources, by default, use term freq, so it shouldn't matter which we choose.
- final FieldType fieldType = UHTestHelper.randomFieldType(random());
+ public TestUnifiedHighlighterRanking() {
+ super(randomFieldType(random()));
+ }
/**
* indexes a bunch of gibberish, and then highlights top(n). asserts that top(n) highlights is a
@@ -66,9 +63,7 @@ public class TestUnifiedHighlighterRanking extends LuceneTestCase {
// maximum number of sentences in a document
final int maxNumSentences = 20;
- Directory dir = newDirectory();
- indexAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document document = new Document();
Field id = new StringField("id", "", Field.Store.NO);
Field body = new Field("body", "", fieldType);
@@ -255,8 +250,6 @@ public class TestUnifiedHighlighterRanking extends LuceneTestCase {
/** sets b=0 to disable passage length normalization */
public void testCustomB() throws Exception {
- Directory dir = newDirectory();
- indexAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
IndexWriterConfig iwc = newIndexWriterConfig(indexAnalyzer);
iwc.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
@@ -308,7 +301,7 @@ public class TestUnifiedHighlighterRanking extends LuceneTestCase {
/** sets k1=0 for simple coordinate-level match (# of query terms present) */
public void testCustomK1() throws Exception {
Directory dir = newDirectory();
- indexAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
+ Analyzer indexAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
IndexWriterConfig iwc = newIndexWriterConfig(indexAnalyzer);
iwc.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java
index fd7f84847b3..f31a4c1b149 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java
@@ -25,16 +25,13 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.junit.Test;
-public class TestUnifiedHighlighterReanalysis extends LuceneTestCase {
-
- private MockAnalyzer indexAnalyzer =
- new MockAnalyzer(random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase;
+public class TestUnifiedHighlighterReanalysis extends UnifiedHighlighterTestBase {
+ public TestUnifiedHighlighterReanalysis() {
+ super(randomFieldType(random()));
+ }
@Test
public void testWithoutIndexSearcher() throws IOException {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
index 9f189a215b8..c299c63e57d 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.uhighlight;
+import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import java.io.IOException;
import java.util.Collection;
@@ -53,23 +54,15 @@ import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.QueryBuilder;
import org.junit.After;
import org.junit.Before;
// TODO rename to reflect position sensitivity
-public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase {
+public class TestUnifiedHighlighterStrictPhrases extends UnifiedHighlighterTestBase {
- final FieldType fieldType;
-
- Directory dir;
- MockAnalyzer indexAnalyzer;
RandomIndexWriter indexWriter;
IndexSearcher searcher;
UnifiedHighlighter highlighter;
@@ -81,26 +74,26 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase {
@ParametersFactory
public static Iterable<Object[]> parameters() {
- return UHTestHelper.parametersFactoryList();
+ return parametersFactoryList();
}
- public TestUnifiedHighlighterStrictPhrases(FieldType fieldType) {
- this.fieldType = fieldType;
+ public TestUnifiedHighlighterStrictPhrases(@Name("fieldType") FieldType fieldType) {
+ super(fieldType);
}
@Before
- public void doBefore() throws IOException {
- indexAnalyzer =
- new MockAnalyzer(
- random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
indexAnalyzer.setPositionIncrementGap(3); // more than default
- dir = newDirectory();
- indexWriter = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ indexWriter = newIndexOrderPreservingWriter();
}
@After
- public void doAfter() throws IOException {
- IOUtils.close(indexReader, indexWriter, dir);
+ @Override
+ public void tearDown() throws Exception {
+ IOUtils.close(indexReader, indexWriter);
+ super.tearDown();
}
private Document newDoc(String... bodyVals) {
@@ -502,7 +495,7 @@ public class TestUnifiedHighlighterStrictPhrases extends LuceneTestCase {
final boolean weightMatches =
highlighter.getFlags("body").contains(HighlightFlag.WEIGHT_MATCHES);
- if (fieldType == UHTestHelper.reanalysisType || weightMatches) {
+ if (fieldType == reanalysisType || weightMatches) {
if (weightMatches) {
assertArrayEquals(new String[] {"<b>alpha bravo</b> charlie -"}, snippets);
} else {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
index d4d8f03f337..4ae9eba826f 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java
@@ -16,6 +16,7 @@
*/
package org.apache.lucene.search.uhighlight;
+import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import java.io.BufferedReader;
import java.io.IOException;
@@ -46,42 +47,17 @@ import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
-import org.junit.After;
-import org.junit.Before;
-public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
-
- private final FieldType
- fieldType; // for "body" generally, but not necessarily others. See constructor
-
- private MockAnalyzer indexAnalyzer;
- private Directory dir;
+public class TestUnifiedHighlighterTermIntervals extends UnifiedHighlighterTestBase {
@ParametersFactory
public static Iterable<Object[]> parameters() {
- return UHTestHelper.parametersFactoryList();
- }
-
- public TestUnifiedHighlighterTermIntervals(FieldType fieldType) {
- this.fieldType = fieldType;
- }
-
- @Before
- public void doBefore() throws IOException {
- indexAnalyzer =
- new MockAnalyzer(
- random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase
- dir = newDirectory();
+ return parametersFactoryList();
}
- @After
- public void doAfter() throws IOException {
- dir.close();
+ public TestUnifiedHighlighterTermIntervals(@Name("fieldType") FieldType fieldType) {
+ super(fieldType);
}
static UnifiedHighlighter randomUnifiedHighlighter(
@@ -101,7 +77,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
//
public void testBasics() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -163,7 +139,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
int maxLength = 17;
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
final Field body = new Field("body", bodyText, fieldType);
@@ -193,7 +169,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
// simple test highlighting last word.
public void testHighlightLastWord() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -219,7 +195,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
// simple test with one sentence documents.
public void testOneSentence() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -247,7 +223,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
// simple test with multiple values that make a result longer than maxLength.
public void testMaxLengthWithMultivalue() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -277,7 +253,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testMultipleTerms() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -309,7 +285,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testMultiplePassages() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -350,7 +326,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
+ "and Madhyamaka - Yogacara, the Epistemological tradition, and Tathagatagarbha - Tantric "
+ "Buddhism (Including China and Japan); Buddhism in Nepal and Tibet - Buddhism in South and "
+ "Southeast Asia, and - Buddhism in China, East Asia, and Japan.";
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
@@ -380,7 +356,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
+ "Curious George and the Firefighters is a story based on H. A. and Margret Rey’s "
+ "popular primate and painted in the original watercolor and charcoal style. "
+ "Firefighters are a famously brave lot, but can they withstand a visit from one curious monkey?";
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
@@ -414,7 +390,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
this.getClass().getResourceAsStream("CambridgeMA.utf8"), StandardCharsets.UTF_8));
String text = r.readLine();
r.close();
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", text, fieldType);
Document document = new Document();
document.add(body);
@@ -446,7 +422,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testPassageRanking() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -473,7 +449,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testBooleanMustNot() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body =
new Field(
@@ -502,7 +478,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testHighlightAllText() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -533,7 +509,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testSpecificDocIDs() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -568,7 +544,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testCustomFieldValueSource() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -614,7 +590,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
/** Make sure highlighter returns first N sentences if there were no hits. */
public void testEmptyHighlights() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -644,7 +620,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
/** Not empty but nothing analyzes. Ensures we address null term-vectors. */
public void testNothingAnalyzes() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", " ", fieldType)); // just a space! (thus not empty)
@@ -676,7 +652,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
/** Make sure highlighter we can customize how emtpy highlight is returned. */
public void testCustomEmptyHighlights() throws Exception {
indexAnalyzer.setPositionIncrementGap(10);
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -709,7 +685,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
/** Make sure highlighter returns whole text when there are no hits and BreakIterator is null. */
public void testEmptyHighlightsWhole() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -743,7 +719,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
/** Make sure highlighter is OK with entirely missing field. */
public void testFieldIsMissing() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
@@ -772,7 +748,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testFieldIsJustSpace() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", " ", fieldType));
@@ -803,7 +779,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testFieldIsEmptyString() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Document doc = new Document();
doc.add(new Field("body", "", fieldType));
@@ -834,7 +810,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testMultipleDocs() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
int numDocs = atLeast(100);
for (int i = 0; i < numDocs; i++) {
@@ -880,7 +856,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testEncode() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -911,7 +887,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
// LUCENE-4906
public void testObjectFormatter() throws Exception {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
@@ -959,7 +935,7 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
private IndexReader indexSomeFields() throws IOException {
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
FieldType ft = new FieldType();
ft.setIndexOptions(IndexOptions.NONE);
ft.setTokenized(false);
@@ -1015,11 +991,11 @@ public class TestUnifiedHighlighterTermIntervals extends LuceneTestCase {
}
public void testNotReanalyzed() throws Exception {
- if (fieldType == UHTestHelper.reanalysisType) {
+ if (fieldType == reanalysisType) {
return; // we're testing the *other* cases
}
- RandomIndexWriter iw = new RandomIndexWriter(random(), dir, indexAnalyzer);
+ RandomIndexWriter iw = newIndexOrderPreservingWriter();
Field body = new Field("body", "", fieldType);
Document doc = new Document();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
index 341318739f1..35a638e2aa1 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
@@ -42,13 +41,7 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.tests.analysis.MockAnalyzer;
-import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.apache.lucene.tests.util.LuceneTestCase;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -58,22 +51,10 @@ import org.junit.Test;
* tests pick the offset source at random (to include term vectors) and in-effect test term vectors
* generally.
*/
-public class TestUnifiedHighlighterTermVec extends LuceneTestCase {
+public class TestUnifiedHighlighterTermVec extends UnifiedHighlighterTestBase {
- private Analyzer indexAnalyzer;
- private Directory dir;
-
- @Before
- public void doBefore() {
- indexAnalyzer =
- new MockAnalyzer(
- random(), MockTokenizer.SIMPLE, true); // whitespace, punctuation, lowercase
- dir = newDirectory();
- }
-
- @After
- public void doAfter() throws IOException {
- dir.close();
+ public TestUnifiedHighlighterTermVec() {
+ super(randomFieldType(random()));
}
public void testFetchTermVecsOncePerDoc() throws IOException {
@@ -86,16 +67,16 @@ public class TestUnifiedHighlighterTermVec extends LuceneTestCase {
List<FieldType> fieldTypes = new ArrayList<>(numTvFields);
for (int i = 0; i < numTvFields; i++) {
fields.add("body" + i);
- fieldTypes.add(UHTestHelper.randomFieldType(random()));
+ fieldTypes.add(randomFieldType(random()));
}
// ensure at least one has TVs by setting one randomly to it:
- fieldTypes.set(random().nextInt(fieldTypes.size()), UHTestHelper.tvType);
+ fieldTypes.set(random().nextInt(fieldTypes.size()), tvType);
final int numDocs = 1 + random().nextInt(3);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
for (String field : fields) {
- doc.add(new Field(field, "some test text", UHTestHelper.tvType));
+ doc.add(new Field(field, "some test text", tvType));
}
iw.addDocument(doc);
}
@@ -179,7 +160,7 @@ public class TestUnifiedHighlighterTermVec extends LuceneTestCase {
@Test(expected = IllegalArgumentException.class)
public void testUserFailedToIndexOffsets() throws IOException {
- FieldType fieldType = new FieldType(UHTestHelper.tvType); // note: it's indexed too
+ FieldType fieldType = new FieldType(tvType); // note: it's indexed too
fieldType.setStoreTermVectorPositions(random().nextBoolean());
fieldType.setStoreTermVectorOffsets(false);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UHTestHelper.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UnifiedHighlighterTestBase.java
similarity index 57%
rename from lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UHTestHelper.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UnifiedHighlighterTestBase.java
index e4a9558d04a..938cb8a4786 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UHTestHelper.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/UnifiedHighlighterTestBase.java
@@ -16,14 +16,30 @@
*/
package org.apache.lucene.search.uhighlight;
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import java.io.IOException;
import java.util.Arrays;
import java.util.Random;
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.tests.analysis.MockAnalyzer;
+import org.apache.lucene.tests.analysis.MockTokenizer;
+import org.apache.lucene.tests.index.RandomIndexWriter;
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.apache.lucene.util.IOUtils;
+import org.junit.After;
+import org.junit.Before;
-/** Helper for {@link UnifiedHighlighter} tests. */
-class UHTestHelper {
+/** Parent class for unified highlighter tests. */
+abstract class UnifiedHighlighterTestBase extends LuceneTestCase {
+ /** Randomized field type for the "body" field, generally. */
+ protected final FieldType fieldType;
+
+ protected MockAnalyzer indexAnalyzer;
+ protected Directory dir;
static final FieldType postingsType = new FieldType(TextField.TYPE_STORED);
static final FieldType tvType = new FieldType(TextField.TYPE_STORED);
@@ -46,6 +62,46 @@ class UHTestHelper {
// re-analysis type needs no further changes.
}
+ UnifiedHighlighterTestBase(@Name("fieldType") FieldType fieldType) {
+ this.fieldType = fieldType;
+ }
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ dir = newDirectory();
+ indexAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
+ }
+
+ @After
+ @Override
+ public void tearDown() throws Exception {
+ IOUtils.close(dir);
+ super.tearDown();
+ }
+
+ /**
+ * @return Returns a {@link RandomIndexWriter} but avoids using random merge policy, which may
+ * reorder documents (which assertions rely on).
+ */
+ static RandomIndexWriter newIndexOrderPreservingWriter(Directory dir, Analyzer indexAnalyzer)
+ throws IOException {
+ return new RandomIndexWriter(
+ random(),
+ dir,
+ LuceneTestCase.newIndexWriterConfig(indexAnalyzer)
+ .setMergePolicy(LuceneTestCase.newMergePolicy(random(), false)));
+ }
+
+ /**
+ * @return Returns a {@link RandomIndexWriter} but avoids using random merge policy, which may
+ * reorder documents (which assertions rely on).
+ */
+ RandomIndexWriter newIndexOrderPreservingWriter() throws IOException {
+ return newIndexOrderPreservingWriter(dir, indexAnalyzer);
+ }
+
public static FieldType randomFieldType(Random random, FieldType... typePossibilities) {
if (typePossibilities == null || typePossibilities.length == 0) {
typePossibilities =