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/07/07 14:48:02 UTC
svn commit: r1358557 - in /lucene/dev/branches/lucene4199/lucene:
core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
test-framework/src/java/org/apache/lucene/util/_TestUtil.java
Author: rmuir
Date: Sat Jul 7 12:48:02 2012
New Revision: 1358557
URL: http://svn.apache.org/viewvc?rev=1358557&view=rev
Log:
LUCENE-4199: fix more default charset uses
Modified:
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1358557&r1=1358556&r2=1358557&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Sat Jul 7 12:48:02 2012
@@ -276,7 +276,7 @@ public class TestPayloadSpans extends Lu
Collection<byte[]> payloads = spans.getPayload();
for (final byte [] payload : payloads) {
- payloadSet.add(new String(payload));
+ payloadSet.add(new String(payload, "UTF-8"));
}
}
}
@@ -311,7 +311,7 @@ public class TestPayloadSpans extends Lu
while (spans.next()) {
Collection<byte[]> payloads = spans.getPayload();
for (final byte[] payload : payloads) {
- payloadSet.add(new String(payload));
+ payloadSet.add(new String(payload, "UTF-8"));
}
}
}
@@ -347,7 +347,7 @@ public class TestPayloadSpans extends Lu
Collection<byte[]> payloads = spans.getPayload();
for (final byte [] payload : payloads) {
- payloadSet.add(new String(payload));
+ payloadSet.add(new String(payload, "UTF-8"));
}
}
}
@@ -383,7 +383,7 @@ public class TestPayloadSpans extends Lu
System.out.println("Num payloads:" + payloads.size());
for (final byte [] bytes : payloads) {
if(VERBOSE)
- System.out.println(new String(bytes));
+ System.out.println(new String(bytes, "UTF-8"));
}
reader.close();
directory.close();
@@ -456,7 +456,7 @@ public class TestPayloadSpans extends Lu
for (final byte [] bytes : payload) {
if(VERBOSE)
System.out.println("doc:" + spans.doc() + " s:" + spans.start() + " e:" + spans.end() + " "
- + new String(bytes));
+ + new String(bytes, "UTF-8"));
}
assertEquals(numPayloads[cnt],payload.size());
@@ -505,9 +505,9 @@ public class TestPayloadSpans extends Lu
if (!nopayload.contains(token)) {
if (entities.contains(token)) {
- payloadAtt.setPayload(new BytesRef((token + ":Entity:"+ pos ).getBytes()));
+ payloadAtt.setPayload(new BytesRef(token + ":Entity:"+ pos ));
} else {
- payloadAtt.setPayload(new BytesRef((token + ":Noise:" + pos ).getBytes()));
+ payloadAtt.setPayload(new BytesRef(token + ":Noise:" + pos ));
}
}
pos += posIncrAtt.getPositionIncrement();
Modified: lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1358557&r1=1358556&r2=1358557&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Sat Jul 7 12:48:02 2012
@@ -187,15 +187,15 @@ public class _TestUtil {
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
CheckIndex checker = new CheckIndex(dir);
checker.setCrossCheckTermVectors(crossCheckTermVectors);
- checker.setInfoStream(new PrintStream(bos), false);
+ checker.setInfoStream(new PrintStream(bos, false, "UTF-8"), false);
CheckIndex.Status indexStatus = checker.checkIndex(null);
if (indexStatus == null || indexStatus.clean == false) {
System.out.println("CheckIndex failed");
- System.out.println(bos.toString());
+ System.out.println(bos.toString("UTF-8"));
throw new RuntimeException("CheckIndex failed");
} else {
if (LuceneTestCase.INFOSTREAM) {
- System.out.println(bos.toString());
+ System.out.println(bos.toString("UTF-8"));
}
return indexStatus;
}