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/03/24 16:30:58 UTC
svn commit: r1304823 - in
/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene:
analysis/BaseTokenStreamTestCase.java util/_TestUtil.java
Author: rmuir
Date: Sat Mar 24 15:30:58 2012
New Revision: 1304823
URL: http://svn.apache.org/viewvc?rev=1304823&view=rev
Log:
LUCENE-3911: always use the same unicode block in the realistic case, sometimes use regexpish for lots of punctuation, fix off-by-one in randomRegexpIshString
Modified:
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.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=1304823&r1=1304822&r2=1304823&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 Sat Mar 24 15:30:58 2012
@@ -611,9 +611,13 @@ public abstract class BaseTokenStreamTes
if (evilness < 10) {
sb.append(_TestUtil.randomSimpleString(random, wordLength));
} else if (evilness < 15) {
- sb.append(_TestUtil.randomRealisticUnicodeString(random, wordLength));
+ assert sb.length() == 0; // we should always get wordLength back!
+ sb.append(_TestUtil.randomRealisticUnicodeString(random, wordLength, wordLength));
} else if (evilness == 16) {
sb.append(_TestUtil.randomHtmlishString(random, wordLength));
+ } else if (evilness == 17) {
+ // gives a lot of punctuation
+ sb.append(_TestUtil.randomRegexpishString(random, wordLength));
} else {
sb.append(_TestUtil.randomUnicodeString(random, wordLength));
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1304823&r1=1304822&r2=1304823&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Sat Mar 24 15:30:58 2012
@@ -264,7 +264,15 @@ public class _TestUtil {
* If you call this enough times, you might get a valid regex!
*/
public static String randomRegexpishString(Random r) {
- final int end = r.nextInt(20);
+ return randomRegexpishString(r, 20);
+ }
+
+ /**
+ * Returns a String thats "regexpish" (contains lots of operators typically found in regular expressions)
+ * If you call this enough times, you might get a valid regex!
+ */
+ public static String randomRegexpishString(Random r, int maxLength) {
+ final int end = nextInt(r, 0, maxLength);
if (end == 0) {
// allow 0 length
return "";