svn commit: r1211995 - /lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java

[rm...@apache.org]

Author: rmuir
Date: Thu Dec  8 17:22:20 2011
New Revision: 1211995

URL: http://svn.apache.org/viewvc?rev=1211995&view=rev
Log:
LUCENE-3606: fix test

Modified:
    lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java

Modified: lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1211995&r1=1211994&r2=1211995&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Thu Dec  8 17:22:20 2011
@@ -176,7 +176,6 @@ public class TestIndexWriterMerging exte
     dir.close();
   }
 
-  /* nocommit: Fix tests to use an id and delete by term
   // LUCENE-325: test forceMergeDeletes, when many adjacent merges are required
   public void testForceMergeDeletes2() throws IOException {
     Directory dir = newDirectory();
@@ -203,15 +202,28 @@ public class TestIndexWriterMerging exte
     document.add(storedField);
     Field termVectorField = newField("termVector", "termVector", customType1);
     document.add(termVectorField);
-    for(int i=0;i<98;i++)
+    Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+    document.add(idField);
+    for(int i=0;i<98;i++) {
+      idField.setValue("" + i);
       writer.addDocument(document);
+    }
     writer.close();
 
     IndexReader ir = IndexReader.open(dir);
     assertEquals(98, ir.maxDoc());
     assertEquals(98, ir.numDocs());
-    for(int i=0;i<98;i+=2)
-      ir.deleteDocument(i);
+    ir.close();
+    
+    IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+      .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+    writer = new IndexWriter(dir, dontMergeConfig);
+    for(int i=0;i<98;i+=2) {
+      writer.deleteDocuments(new Term("id", "" + i));
+    }
+    writer.close();
+    
+    ir = IndexReader.open(dir);
     assertEquals(49, ir.numDocs());
     ir.close();
 
@@ -230,6 +242,7 @@ public class TestIndexWriterMerging exte
     dir.close();
   }
 
+  /* nocommit: Fix tests to use an id and delete by term
   // LUCENE-325: test forceMergeDeletes without waiting, when
   // many adjacent merges are required
   public void testForceMergeDeletes3() throws IOException {