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/04/17 05:38:46 UTC

svn commit: r1326899 - in /lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene: analysis/BaseTokenStreamTestCase.java util/_TestUtil.java

Author: rmuir
Date: Tue Apr 17 03:38:45 2012
New Revision: 1326899

URL: http://svn.apache.org/viewvc?rev=1326899&view=rev
Log:
mix up case in basetokenstreamtestcase, and avoid sun bug 6588260 in re-caser

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=1326899&r1=1326898&r2=1326899&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 Apr 17 03:38:45 2012
@@ -784,7 +784,15 @@ public abstract class BaseTokenStreamTes
         sb.setLength(wordLength-1);
       }
     }
-    return sb.toString();
+    
+    if (random.nextInt(17) == 0) {
+      // mix up case
+      String mixedUp = _TestUtil.randomlyRecaseCodePoints(random, sb.toString());
+      assert mixedUp.length() == sb.length();
+      return mixedUp;
+    } else {
+      return sb.toString();
+    }
   }
 
   protected String toDot(Analyzer a, String inputText) throws IOException {

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=1326899&r1=1326898&r2=1326899&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 Tue Apr 17 03:38:45 2012
@@ -446,11 +446,10 @@ public class _TestUtil {
     while (pos < str.length()) {
       int codePoint = str.codePointAt(pos);
       pos += Character.charCount(codePoint);
-      String codePointSubstring = new String(new int[] { codePoint }, 0, 1);
       switch (nextInt(random, 0, 2)) {
-        case 0: builder.append(codePointSubstring.toUpperCase(Locale.ENGLISH)); break;
-        case 1: builder.append(codePointSubstring.toLowerCase(Locale.ENGLISH)); break;
-        case 2: builder.append(codePointSubstring); // leave intact
+        case 0: builder.appendCodePoint(Character.toUpperCase(codePoint)); break;
+        case 1: builder.appendCodePoint(Character.toLowerCase(codePoint)); break;
+        case 2: builder.appendCodePoint(codePoint); // leave intact
       }
     }
     return builder.toString();