db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r675677 - /db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Date Thu, 10 Jul 2008 18:51:29 GMT
Author: kmarsden
Date: Thu Jul 10 11:51:28 2008
New Revision: 675677

URL: http://svn.apache.org/viewvc?rev=675677&view=rev
Log:
DERBY-3771 testClasspathChecker under SysinfoCPCheckTest failed on Zos


Modified:
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=675677&r1=675676&r2=675677&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
Thu Jul 10 11:51:28 2008
@@ -106,7 +106,7 @@
                 {"nonexist.class", "6", "    (nonexist not found.)", null}
         };
 
-        final String outputEncoding = "US-ASCII";
+        
 
         PrintStream out = System.out;
 
@@ -116,14 +116,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;
 
@@ -148,8 +144,7 @@
             try {
                 BufferedReader sysinfoOutput = new BufferedReader(
                     new InputStreamReader(
-                        new ByteArrayInputStream(testRawBytes),
-                            outputEncoding));
+                        new ByteArrayInputStream(testRawBytes)));
 
                 // evaluate the output
                 // compare the sentence picked



Mime
View raw message