You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/06/20 00:03:39 UTC

svn commit: r1351879 - /lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java

Author: rmuir
Date: Tue Jun 19 22:03:38 2012
New Revision: 1351879

URL: http://svn.apache.org/viewvc?rev=1351879&view=rev
Log:
don't use assume here

Modified:
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1351879&r1=1351878&r2=1351879&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Tue Jun 19 22:03:38 2012
@@ -49,7 +49,6 @@ import org.apache.lucene.util.LineFileDo
 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,11 +437,11 @@ public abstract class BaseTokenStreamTes
     boolean useCharFilter = random.nextBoolean();
     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")));
+    final String postingsFormat =  _TestUtil.getPostingsFormat("dummy");
+    boolean codecOk = iterations * maxWordLength < 100000 ||
+        !(postingsFormat.equals("Memory") ||
+            postingsFormat.equals("SimpleText"));
+    if (rarely(random) && codecOk) {
       dir = newFSDirectory(_TestUtil.getTempDir("bttc"));
       iw = new RandomIndexWriter(new Random(seed), dir, a);
     }