svn commit: r1152089 - /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java

[rm...@apache.org]

Author: rmuir
Date: Fri Jul 29 03:29:09 2011
New Revision: 1152089

URL: http://svn.apache.org/viewvc?rev=1152089&view=rev
Log:
fix unicode violations in test, test relies upon how *invalid* utf8 is converted

Modified:
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java?rev=1152089&r1=1152088&r2=1152089&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java Fri Jul 29 03:29:09 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -347,8 +348,13 @@ public class TestPayloads extends Lucene
         
     }
     
+    static final Charset utf8 = Charset.forName("UTF-8");
     private void generateRandomData(byte[] data) {
-        random.nextBytes(data);
+      // this test needs the random data to be valid unicode
+      String s = _TestUtil.randomFixedByteLengthUnicodeString(random, data.length);
+      byte b[] = s.getBytes(utf8);
+      assert b.length == data.length;
+      System.arraycopy(b, 0, data, 0, b.length);
     }
 
     private byte[] generateRandomData(int n) {
@@ -526,7 +532,7 @@ public class TestPayloads extends Lucene
             for (int i = 0; i < freq; i++) {
               tp.nextPosition();
               final BytesRef payload = tp.getPayload();
-              assertEquals(termText, pool.bytesToString(payload.bytes, payload.offset, payload.length));
+              assertEquals(termText, payload.utf8ToString());
             }
           }
         }
@@ -548,7 +554,7 @@ public class TestPayloads extends Lucene
             this.pool = pool;
             payload = pool.get();
             generateRandomData(payload);
-            term = pool.bytesToString(payload, 0, payload.length);
+            term = new String(payload, 0, payload.length, utf8);
             first = true;
             payloadAtt = addAttribute(PayloadAttribute.class);
             termAtt = addAttribute(CharTermAttribute.class);
@@ -580,17 +586,6 @@ public class TestPayloads extends Lucene
                 pool.add(new byte[size]);
             }
         }
-        
-        static String bytesToString(byte[] bytes, int start, int length) {
-            String s = new String(bytes, start, length);
-            BytesRef utf8Result = new BytesRef(10);
-            UnicodeUtil.UTF16toUTF8(s, 0, s.length(), utf8Result);
-            try {
-                return new String(utf8Result.bytes, 0, utf8Result.length, "UTF-8");
-            } catch (UnsupportedEncodingException uee) {
-                return null;
-            }
-        }
     
         synchronized byte[] get() {
             return pool.remove(0);