From e1ab701ac1dbda427d0f9ba97674d48bcd2660ef Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Thu, 8 Dec 2011 17:41:33 +0000
Subject: [PATCH] LUCENE-3606: fix test

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1212002 13f79535-47bb-0310-9956-ffa450edef68
---
 .../lucene/index/TestDeletionPolicy.java      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java b/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
index 7b20877a4f6..5b7239463cb 100644
--- a/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
+++ b/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
@@ -25,6 +25,7 @@ import java.util.Collection;
 
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.search.IndexSearcher;
@@ -607,7 +608,6 @@ public class TestDeletionPolicy extends LuceneTestCase {
    * Test a deletion policy that keeps last N commits
    * around, through creates.
    */
-  /* nocommit: fix this test, I don't understand it!
   public void testKeepLastNDeletionPolicyWithCreates() throws IOException {
     
     final int N = 10;
@@ -644,16 +644,21 @@ public class TestDeletionPolicy extends LuceneTestCase {
         }
         writer = new IndexWriter(dir, conf);
         for(int j=0;j<17;j++) {
-          addDoc(writer);
+          addDocWithID(writer, i*(N+1)+j);
         }
         // this is a commit
         writer.close();
-        IndexReader reader = IndexReader.open(dir, policy, false);
-        reader.deleteDocument(3);
+        conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+          .setIndexDeletionPolicy(policy)
+          .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+        writer = new IndexWriter(dir, conf);
+        writer.deleteDocuments(new Term("id", "" + (i*(N+1)+3)));
+        // this is a commit
+        writer.close();
+        IndexReader reader = IndexReader.open(dir);
         IndexSearcher searcher = newSearcher(reader);
         ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
         assertEquals(16, hits.length);
-        // this is a commit
         reader.close();
         searcher.close();
 
@@ -718,8 +723,14 @@ public class TestDeletionPolicy extends LuceneTestCase {
       dir.close();
     }
   }
-  */
 
+  private void addDocWithID(IndexWriter writer, int id) throws IOException {
+    Document doc = new Document();
+    doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+    doc.add(newField("id", "" + id, StringField.TYPE_UNSTORED));
+    writer.addDocument(doc);
+  }
+  
   private void addDoc(IndexWriter writer) throws IOException
   {
     Document doc = new Document();