You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/12/08 18:04:06 UTC
svn commit: r1211983 -
/lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
Author: rmuir
Date: Thu Dec 8 17:04:06 2011
New Revision: 1211983
URL: http://svn.apache.org/viewvc?rev=1211983&view=rev
Log:
LUCENE-3606: fix test
Modified:
lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
Modified: lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1211983&r1=1211982&r2=1211983&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Thu Dec 8 17:04:06 2011
@@ -452,7 +452,6 @@ public class TestAddIndexes extends Luce
aux.close();
}
- /* nocommit: re-enable
// case 5: tail segments, invariants not hold
public void testMoreMerges() throws IOException {
// main directory
@@ -461,7 +460,7 @@ public class TestAddIndexes extends Luce
Directory aux = newDirectory();
Directory aux2 = newDirectory();
- setUpDirs(dir, aux);
+ setUpDirs(dir, aux, true);
IndexWriter writer = newWriter(
aux2,
@@ -475,17 +474,25 @@ public class TestAddIndexes extends Luce
assertEquals(3, writer.getSegmentCount());
writer.close();
- IndexReader reader = IndexReader.open(aux);
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ writer = new IndexWriter(aux, dontMergeConfig);
for (int i = 0; i < 27; i++) {
- reader.deleteDocument(i);
+ writer.deleteDocuments(new Term("id", "" + i));
}
+ writer.close();
+ IndexReader reader = IndexReader.open(aux);
assertEquals(3, reader.numDocs());
reader.close();
- reader = IndexReader.open(aux2);
+ dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ writer = new IndexWriter(aux2, dontMergeConfig);
for (int i = 0; i < 8; i++) {
- reader.deleteDocument(i);
+ writer.deleteDocuments(new Term("id", "" + i));
}
+ writer.close();
+ reader = IndexReader.open(aux2);
assertEquals(22, reader.numDocs());
reader.close();
@@ -505,7 +512,6 @@ public class TestAddIndexes extends Luce
aux.close();
aux2.close();
}
- */
private IndexWriter newWriter(Directory dir, IndexWriterConfig conf)
throws IOException {