Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 34714 invoked from network); 10 Jul 2008 18:51:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2008 18:51:50 -0000 Received: (qmail 19531 invoked by uid 500); 10 Jul 2008 18:51:50 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 19452 invoked by uid 500); 10 Jul 2008 18:51:50 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 19443 invoked by uid 99); 10 Jul 2008 18:51:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 11:51:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 18:51:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 65F6A2388A15; Thu, 10 Jul 2008 11:51:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080710185129.65F6A2388A15@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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