svn commit: r1064463 - in /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index: TestIndexWriterReader.java codecs/mockrandom/MockRandomCodec.java

[sh...@apache.org]

Author: shaie
Date: Fri Jan 28 05:25:35 2011
New Revision: 1064463

URL: http://svn.apache.org/viewvc?rev=1064463&view=rev
Log:
LUCENE-2895: MockRandomCodec loads termsIndex even if termsIndexDivisor is set to -1

Modified:
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1064463&r1=1064462&r2=1064463&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Fri Jan 28 05:25:35 2011
@@ -31,7 +31,6 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.document.Field.TermVector;
-import org.apache.lucene.index.codecs.CodecProvider;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -994,16 +993,14 @@ public class TestIndexWriterReader exten
   }
   
   public void testNoTermsIndex() throws Exception {
-    // Some Codecs don't honor the ReaderTermsIndexDiviso, so skip the test if
+    // Some Codecs don't honor the ReaderTermsIndexDivisor, so skip the test if
     // they're picked.
     HashSet<String> illegalCodecs = new HashSet<String>();
     illegalCodecs.add("PreFlex");
-    illegalCodecs.add("MockRandom");
     illegalCodecs.add("SimpleText");
 
     IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
         new MockAnalyzer()).setReaderTermsIndexDivisor(-1);
-    
     // Don't proceed if picked Codec is in the list of illegal ones.
     if (illegalCodecs.contains(conf.getCodecProvider().getFieldCodec("f"))) return;
 

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java?rev=1064463&r1=1064462&r2=1064463&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java Fri Jan 28 05:25:35 2011
@@ -236,7 +236,11 @@ public class MockRandomCodec extends Cod
 
     try {
       if (random.nextBoolean()) {
-        state.termsIndexDivisor = _TestUtil.nextInt(random, 1, 10);
+        // if termsIndexDivisor is set to -1, we should not touch it. It means a
+        // test explicitly instructed not to load the terms index.
+        if (state.termsIndexDivisor != -1) {
+          state.termsIndexDivisor = _TestUtil.nextInt(random, 1, 10);
+        }
         if (LuceneTestCase.VERBOSE) {
           System.out.println("MockRandomCodec: fixed-gap terms index (divisor=" + state.termsIndexDivisor + ")");
         }