Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99FE99CE2 for ; Thu, 14 Jun 2012 22:04:14 +0000 (UTC) Received: (qmail 44294 invoked by uid 500); 14 Jun 2012 22:04:14 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 44268 invoked by uid 500); 14 Jun 2012 22:04:14 -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 44260 invoked by uid 99); 14 Jun 2012 22:04:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2012 22:04:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 14 Jun 2012 22:04:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4864D2388860; Thu, 14 Jun 2012 22:03:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1350410 - /db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java Date: Thu, 14 Jun 2012 22:03:53 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120614220353.4864D2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Thu Jun 14 22:03:52 2012 New Revision: 1350410 URL: http://svn.apache.org/viewvc?rev=1350410&view=rev Log: DERBY-5424 On z/OS testConnectWrongSubprotocolWithSystemProperty(org.apache.derbyTesting.functionTests.tests.tools.ConnectWrongSubprotocolTest)junit.framework.AssertionFailedError Fix test encoding issue Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java?rev=1350410&r1=1350409&r2=1350410&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java (original) +++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java Thu Jun 14 22:03:52 2012 @@ -86,7 +86,7 @@ public class ConnectWrongSubprotocolTest private String runIjScript(String ijScript, boolean useSystemProperties) throws UnsupportedEncodingException, SQLException { ByteArrayInputStream bais = - new ByteArrayInputStream(ijScript.getBytes()); + new ByteArrayInputStream(ijScript.getBytes("US-ASCII")); ByteArrayOutputStream baos = new ByteArrayOutputStream(10 * 1024); Connection conn = getConnection(); @@ -101,6 +101,6 @@ public class ConnectWrongSubprotocolTest if (!conn.isClosed() && !conn.getAutoCommit()) conn.commit(); - return new String(baos.toByteArray()); + return new String(baos.toByteArray(), "US-ASCII"); } }