svn commit: r1351832 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/analysis/ lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/analysis/

[mi...@apache.org]

Author: mikemccand
Date: Tue Jun 19 20:11:32 2012
New Revision: 1351832

URL: http://svn.apache.org/viewvc?rev=1351832&view=rev
Log:
don't use Memory/SimpleText postings format when indexing too many tokens from random data

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/analysis/   (props changed)
    lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
    lucene/dev/branches/branch_4x/lucene/test-framework/   (props changed)
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java

Modified: lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java?rev=1351832&r1=1351831&r2=1351832&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java Tue Jun 19 20:11:32 2012
@@ -36,11 +36,9 @@ import org.apache.lucene.analysis.ja.dic
 import org.apache.lucene.analysis.ja.tokenattributes.*;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.lucene.util.UnicodeUtil;
 import org.apache.lucene.util._TestUtil;
 
-@SuppressCodecs({ "Memory" })
 public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
 
   public static UserDictionary readDict() {

Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1351832&r1=1351831&r2=1351832&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Tue Jun 19 20:11:32 2012
@@ -26,11 +26,11 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Random;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Random;
 import java.util.Set;
 
 import org.apache.lucene.analysis.tokenattributes.*;
@@ -45,10 +45,11 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.util.Attribute;
 import org.apache.lucene.util.AttributeImpl;
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LineFileDocs;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.Rethrow;
+import org.apache.lucene.util._TestUtil;
+import org.junit.Assume;
 
 /** 
  * Base class for all Lucene unit tests that use TokenStreams. 
@@ -438,6 +439,10 @@ public abstract class BaseTokenStreamTes
     Directory dir = null;
     RandomIndexWriter iw = null;
     if (rarely(random)) {
+      final String postingsFormat =  _TestUtil.getPostingsFormat("dummy");
+      Assume.assumeTrue(iterations * maxWordLength < 100000 ||
+                        !(postingsFormat.equals("Memory") ||
+                          postingsFormat.equals("SimpleText")));
       dir = newFSDirectory(_TestUtil.getTempDir("bttc"));
       iw = new RandomIndexWriter(new Random(seed), dir, a);
     }