LUCENE-3606: fix test

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1211991 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-12-08 17:17:23 +00:00
parent ef6f10a14c
commit f983027651

View File

@ -116,7 +116,6 @@ public class TestIndexWriterMerging extends LuceneTestCase
writer.close(); writer.close();
} }
/* nocommit: Fix tests to use an id and delete by term
// LUCENE-325: test forceMergeDeletes, when 2 singular merges // LUCENE-325: test forceMergeDeletes, when 2 singular merges
// are required // are required
public void testForceMergeDeletes() throws IOException { public void testForceMergeDeletes() throws IOException {
@ -136,19 +135,31 @@ public class TestIndexWriterMerging extends LuceneTestCase
customType1.setStoreTermVectorPositions(true); customType1.setStoreTermVectorPositions(true);
customType1.setStoreTermVectorOffsets(true); customType1.setStoreTermVectorOffsets(true);
Field idField = newField("id", "", StringField.TYPE_UNSTORED);
document.add(idField);
Field storedField = newField("stored", "stored", customType); Field storedField = newField("stored", "stored", customType);
document.add(storedField); document.add(storedField);
Field termVectorField = newField("termVector", "termVector", customType1); Field termVectorField = newField("termVector", "termVector", customType1);
document.add(termVectorField); document.add(termVectorField);
for(int i=0;i<10;i++) for(int i=0;i<10;i++) {
idField.setValue("" + i);
writer.addDocument(document); writer.addDocument(document);
}
writer.close(); writer.close();
IndexReader ir = IndexReader.open(dir); IndexReader ir = IndexReader.open(dir);
assertEquals(10, ir.maxDoc()); assertEquals(10, ir.maxDoc());
assertEquals(10, ir.numDocs()); assertEquals(10, ir.numDocs());
ir.deleteDocument(0); ir.close();
ir.deleteDocument(7);
IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setMergePolicy(NoMergePolicy.COMPOUND_FILES);
writer = new IndexWriter(dir, dontMergeConfig);
writer.deleteDocuments(new Term("id", "0"));
writer.deleteDocuments(new Term("id", "7"));
writer.close();
ir = IndexReader.open(dir);
assertEquals(8, ir.numDocs()); assertEquals(8, ir.numDocs());
ir.close(); ir.close();
@ -165,6 +176,7 @@ public class TestIndexWriterMerging extends LuceneTestCase
dir.close(); dir.close();
} }
/* nocommit: Fix tests to use an id and delete by term
// LUCENE-325: test forceMergeDeletes, when many adjacent merges are required // LUCENE-325: test forceMergeDeletes, when many adjacent merges are required
public void testForceMergeDeletes2() throws IOException { public void testForceMergeDeletes2() throws IOException {
Directory dir = newDirectory(); Directory dir = newDirectory();