You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/06/01 19:15:54 UTC

lucene-solr:branch_6x: LUCENE-7236: Fix test bug

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 089491990 -> 36ee71320


LUCENE-7236: Fix test bug


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/36ee7132
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/36ee7132
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/36ee7132

Branch: refs/heads/branch_6x
Commit: 36ee71320ad007b7cdedef4a3a67396628604db7
Parents: 0894919
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Jun 1 20:14:54 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Jun 1 20:15:45 2016 +0100

----------------------------------------------------------------------
 .../apache/lucene/search/spans/TestSpanCollection.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/36ee7132/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java
index 7b90b2b..8e45482 100644
--- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java
+++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java
@@ -17,13 +17,16 @@
 package org.apache.lucene.search.spans;
 
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.NoMergePolicy;
 import org.apache.lucene.index.PostingsEnum;
 import org.apache.lucene.index.RandomIndexWriter;
 import org.apache.lucene.index.Term;
@@ -32,10 +35,6 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.LuceneTestCase;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
 public class TestSpanCollection extends LuceneTestCase {
 
   protected IndexSearcher searcher;
@@ -61,7 +60,7 @@ public class TestSpanCollection extends LuceneTestCase {
     super.setUp();
     directory = newDirectory();
     RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
-        newIndexWriterConfig(new MockAnalyzer(random())));
+        newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
     for (int i = 0; i < docFields.length; i++) {
       Document doc = new Document();
       doc.add(newField(FIELD, docFields[i], OFFSETS));