svn commit: r1421010 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java

[jp...@apache.org]

Author: jpountz
Date: Wed Dec 12 22:00:10 2012
New Revision: 1421010

URL: http://svn.apache.org/viewvc?rev=1421010&view=rev
Log:
TestCompressingStoredFieldsFormat.testDeletePartiallyWrittenFilesIfAbort: disable CFS in order to be able to check file names (merged from r1421003).

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java?rev=1421010&r1=1421009&r2=1421010&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java Wed Dec 12 22:00:10 2012
@@ -365,6 +365,11 @@ public class TestCompressingStoredFields
   
   @Test(expected=IllegalArgumentException.class)
   public void testDeletePartiallyWrittenFilesIfAbort() throws IOException {
+    // disable CFS because this test checks file names
+    iwConf.setMergePolicy(newLogMergePolicy(false));
+    iw.close();
+    iw = new RandomIndexWriter(random(), dir, iwConf);
+
     final Document validDoc = new Document();
     validDoc.add(new IntField("id", 0, Store.YES));
     iw.addDocument(validDoc);