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 3835A900A for ; Mon, 12 Dec 2011 22:30:08 +0000 (UTC) Received: (qmail 25263 invoked by uid 500); 12 Dec 2011 22:30:08 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 25241 invoked by uid 500); 12 Dec 2011 22:30:08 -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 25229 invoked by uid 99); 12 Dec 2011 22:30:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2011 22:30:08 +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; Mon, 12 Dec 2011 22:30:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5966C23889E2; Mon, 12 Dec 2011 22:29:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213473 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Date: Mon, 12 Dec 2011 22:29:46 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111212222946.5966C23889E2@eris.apache.org> Author: myrnavl Date: Mon Dec 12 22:29:45 2011 New Revision: 1213473 URL: http://svn.apache.org/viewvc?rev=1213473&view=rev Log: DERBY-4836; many failures with IBM 1.5 and 1.6 on windows after test InternationalConnectTest revive test for IBM 1.5 and 1.6 jvms; need IBM 1.6 SR9 and IBM 1.5 SR13. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java?rev=1213473&r1=1213472&r2=1213473&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Mon Dec 12 22:29:45 2011 @@ -69,18 +69,18 @@ public class InternationalConnectTest ex public void testBoundaries() throws SQLException, UnsupportedEncodingException { if (usingEmbedded()) return; /* This test is only for Client/Server */ + // ensuring that we get a connection. + getConnection(); + /* * Sun's 1.4.2 JVM and IBM's JVM (any version) fail on Windows for this test * Thus, we skip it. * * Read JIRA's DERBY-4836 for more information. */ - if (getSystemProperty("os.name").startsWith("Windows")) { - /* Skip with IBM */ - if (isIBMJVM()) return; - - /* Skip with Sun 1.4.2 */ - if (isSunJVM() && getSystemProperty("java.version").startsWith("1.4.2")) return; + if (getSystemProperty("os.name").startsWith("Windows")) { + /* Skip with 1.4.2 jvms */ + if (getSystemProperty("java.version").startsWith("1.4.2")) return; } /*