Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix false failure: test was converting invalid UTF8 to UTF16 through 2 different APIs (java & Lucene) and then asserting result is equal 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@955545 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-06-17 10:48:20 +00:00
parent 3ffe87df60
commit 8c10e9badb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lucene/src/test/org/apache/lucene/index/TestPayloads.java
View File

@ -529,7 +529,8 @@ public class TestPayloads extends LuceneTestCase {
int freq = tp.freq();
for (int i = 0; i < freq; i++) {
tp.nextPosition();
assertEquals(tp.getPayload().utf8ToString(), termText);
final BytesRef payload = tp.getPayload();
assertEquals(termText, pool.bytesToString(payload.bytes, payload.offset, payload.length));
}
}
}
@ -551,7 +552,7 @@ public class TestPayloads extends LuceneTestCase {
this.pool = pool;
payload = pool.get();
generateRandomData(payload);
term = pool.bytesToString(payload);
term = pool.bytesToString(payload, 0, payload.length);
first = true;
payloadAtt = addAttribute(PayloadAttribute.class);
termAtt = addAttribute(CharTermAttribute.class);
@ -584,10 +585,9 @@ public class TestPayloads extends LuceneTestCase {
}
}
private BytesRef utf8Result = new BytesRef(10);
synchronized String bytesToString(byte[] bytes) {
String s = new String(bytes);
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");