svn commit: r1358558 - in /lucene/dev/branches/lucene4199/lucene: core/src/test/org/apache/lucene/index/TestCheckIndex.java core/src/test/org/apache/lucene/search/TestFieldCache.java demo/src/test/org/apache/lucene/demo/TestDemo.java

[rm...@apache.org]

Author: rmuir
Date: Sat Jul  7 12:53:07 2012
New Revision: 1358558

URL: http://svn.apache.org/viewvc?rev=1358558&view=rev
Log:
LUCENE-4199: fix more default charset uses

Modified:
    lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
    lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
    lucene/dev/branches/lucene4199/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java

Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=1358558&r1=1358557&r2=1358558&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java Sat Jul  7 12:53:07 2012
@@ -52,12 +52,12 @@ public class TestCheckIndex extends Luce
 
     ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
     CheckIndex checker = new CheckIndex(dir);
-    checker.setInfoStream(new PrintStream(bos));
+    checker.setInfoStream(new PrintStream(bos, false, "UTF-8"));
     if (VERBOSE) checker.setInfoStream(System.out);
     CheckIndex.Status indexStatus = checker.checkIndex();
     if (indexStatus.clean == false) {
       System.out.println("CheckIndex failed");
-      System.out.println(bos.toString());
+      System.out.println(bos.toString("UTF-8"));
       fail();
     }
     

Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1358558&r1=1358557&r2=1358558&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Sat Jul  7 12:53:07 2012
@@ -117,10 +117,10 @@ public class TestFieldCache extends Luce
     try {
       FieldCache cache = FieldCache.DEFAULT;
       ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
-      cache.setInfoStream(new PrintStream(bos));
+      cache.setInfoStream(new PrintStream(bos, false, "UTF-8"));
       cache.getDoubles(reader, "theDouble", false);
       cache.getFloats(reader, "theDouble", false);
-      assertTrue(bos.toString().indexOf("WARNING") != -1);
+      assertTrue(bos.toString("UTF-8").indexOf("WARNING") != -1);
     } finally {
       FieldCache.DEFAULT.purgeAllCaches();
     }

Modified: lucene/dev/branches/lucene4199/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java?rev=1358558&r1=1358557&r2=1358558&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java (original)
+++ lucene/dev/branches/lucene4199/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java Sat Jul  7 12:53:07 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.demo;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
+import java.nio.charset.Charset;
 
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util._TestUtil;
@@ -30,11 +31,11 @@ public class TestDemo extends LuceneTest
     PrintStream outSave = System.out;
     try {
       ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      PrintStream fakeSystemOut = new PrintStream(bytes);
+      PrintStream fakeSystemOut = new PrintStream(bytes, false, Charset.defaultCharset().name());
       System.setOut(fakeSystemOut);
       SearchFiles.main(new String[] {"-query", query, "-index", indexPath.getPath()});
       fakeSystemOut.flush();
-      String output = bytes.toString(); // intentionally use default encoding
+      String output = bytes.toString(Charset.defaultCharset().name()); // intentionally use default encoding
       assertTrue("output=" + output, output.contains(expectedHitCount + " total matching documents"));
     } finally {
       System.setOut(outSave);