svn commit: r1238884 - /lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java

[sa...@apache.org]

Author: sarowe
Date: Wed Feb  1 00:47:49 2012
New Revision: 1238884

URL: http://svn.apache.org/viewvc?rev=1238884&view=rev
Log:
Switch from assertion in MockTokenizer.readCodePoint() that test data does not containing character U+FFFF to a AssumptionViolatedException, so that randomly generated test data doesn't have to handle this case. (LUCENE-3743 is a pre-requisite for this, to properly handle multi-threaded tests.)

Modified:
    lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java

Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java?rev=1238884&r1=1238883&r2=1238884&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/analysis/MockTokenizer.java Wed Feb  1 00:47:49 2012
@@ -23,6 +23,7 @@ import java.io.Reader;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
 import org.apache.lucene.util.AttributeSource.AttributeFactory;
+import org.junit.internal.AssumptionViolatedException;
 
 /**
  * Tokenizer for testing.
@@ -122,7 +123,10 @@ public class MockTokenizer extends Token
     if (ch < 0) {
       return ch;
     } else {
-      assert ch != 0xffff; /* only on 3.x */
+      if (ch == 0xffff) {
+        throw new AssumptionViolatedException
+            ("Test data cannot contain '\\uFFFF' (Lucene 3.x only)");
+      }
       assert !Character.isLowSurrogate((char) ch);
       off++;
       if (Character.isHighSurrogate((char) ch)) {