You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2008/07/10 20:56:31 UTC
svn commit: r675679 -
/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Author: kmarsden
Date: Thu Jul 10 11:56:31 2008
New Revision: 675679
URL: http://svn.apache.org/viewvc?rev=675679&view=rev
Log:
DERBY-3771 testClasspathChecker under SysinfoCPCheckTest failed on Zos
Modified:
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=675679&r1=675678&r2=675679&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java Thu Jul 10 11:56:31 2008
@@ -105,7 +105,7 @@
{"nonexist.class", "6", " (nonexist not found.)", null}
};
- final String outputEncoding = "US-ASCII";
+
PrintStream out = System.out;
@@ -115,14 +115,10 @@
ByteArrayOutputStream rawBytes = getOutputStream();
// First obtain the output for the sysinfo command
- try {
- PrintStream testOut = new PrintStream(rawBytes,
- false, outputEncoding);
- setSystemOut(testOut);
- } catch (UnsupportedEncodingException uee) {
- uee.printStackTrace();
- }
-
+ PrintStream testOut = new PrintStream(rawBytes,
+ false);
+ setSystemOut(testOut);
+
if (!checkClientOrServer(tstargs[tst][0]))
continue;
@@ -147,8 +143,7 @@
try {
BufferedReader sysinfoOutput = new BufferedReader(
new InputStreamReader(
- new ByteArrayInputStream(testRawBytes),
- outputEncoding));
+ new ByteArrayInputStream(testRawBytes)));
// evaluate the output
// compare the sentence picked