From derby-commits-return-15234-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Fri Feb 17 01:30:47 2012 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 E08779957 for ; Fri, 17 Feb 2012 01:30:47 +0000 (UTC) Received: (qmail 22989 invoked by uid 500); 17 Feb 2012 01:30:47 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 22964 invoked by uid 500); 17 Feb 2012 01:30:47 -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 22957 invoked by uid 99); 17 Feb 2012 01:30:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2012 01:30:47 +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; Fri, 17 Feb 2012 01:30:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1B26723889B8; Fri, 17 Feb 2012 01:30:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1245283 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi: InternationalConnectSimpleDSTest.java InternationalConnectTest.java Date: Fri, 17 Feb 2012 01:30:21 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120217013022.1B26723889B8@eris.apache.org> Author: myrnavl Date: Fri Feb 17 01:30:21 2012 New Revision: 1245283 URL: http://svn.apache.org/viewvc?rev=1245283&view=rev Log: DERBY-4149; test failure in jdbcapi.InternationalConnectSimpleDSTest fixture testSimpleDSConnect on IBM iseries - Database '?' not found. reinstating the skipped test cases after fix of jvm on iseries Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectSimpleDSTest.java 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/InternationalConnectSimpleDSTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectSimpleDSTest.java?rev=1245283&r1=1245282&r2=1245283&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectSimpleDSTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectSimpleDSTest.java Fri Feb 17 01:30:21 2012 @@ -27,7 +27,6 @@ import java.sql.SQLException; import javax.sql.DataSource; import junit.framework.Test; -import junit.framework.TestSuite; import org.apache.derbyTesting.junit.BaseJDBCTestCase; import org.apache.derbyTesting.junit.JDBCDataSource; @@ -102,14 +101,6 @@ public class InternationalConnectSimpleD } public static Test suite() { - /* - * IBM's jvms on iseries have a bug that causes this fixture to fail - * and leave behind a hard-to-remove file, see DERBY-4149. - * Skip on that O.S. - */ - if (getSystemProperty("os.name").startsWith("OS/400")) { - return(new TestSuite ("emtpy InternationalConnectSimpleDSTest")); - } return TestConfiguration.defaultSuite(InternationalConnectSimpleDSTest.class); } 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=1245283&r1=1245282&r2=1245283&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 Fri Feb 17 01:30:21 2012 @@ -83,15 +83,6 @@ public class InternationalConnectTest ex if (getSystemProperty("java.version").startsWith("1.4.2")) return; } - /* - * IBM's jvms on iseries have a bug that causes this fixture to fail - * and leave behind a hard-to-remove file, see DERBY-4149. - * Skip on that O.S. - */ - if (getSystemProperty("os.name").startsWith("OS/400")) { - return; - } - // Maximum length in bytes is 255. We subtract 14 to account for // ;create=true and ;shutdown=true int maxNameLength = 255 - 14; @@ -147,16 +138,7 @@ public class InternationalConnectTest ex * * @throws SQLException */ - public void testDriverManagerConnect() throws SQLException { - /* - * IBM's jvms on iseries have a bug that causes this fixture to fail - * and leave behind a hard-to-remove file, see DERBY-4149. - * Skip on that O.S. - */ - if (getSystemProperty("os.name").startsWith("OS/400")) { - return; - } - + public void testDriverManagerConnect() throws SQLException { //get a connection to load the driver getConnection(); Connection conn = null; @@ -197,16 +179,7 @@ public class InternationalConnectTest ex * Test XA Connection for chinese database name, user and password. * @throws SQLException */ - public void testXADSConnect() throws SQLException { - /* - * IBM's jvms on iseries have a bug that causes this fixture to fail - * and leave behind a hard-to-remove file, see DERBY-4149. - * Skip on that O.S. - */ - if (getSystemProperty("os.name").startsWith("OS/400")) { - return; - } - + public void testXADSConnect() throws SQLException { // Test chinese database name. XADataSource ds = J2EEDataSource.getXADataSource(); J2EEDataSource.setBeanProperty(ds, "databaseName", "\u4e10"); @@ -238,15 +211,6 @@ public class InternationalConnectTest ex * @throws SQLException */ public void testCPDSConnect() throws SQLException { - /* - * IBM's jvms on iseries have a bug that causes this fixture to fail - * and leave behind a hard-to-remove file, see DERBY-4149. - * Skip on that O.S. - */ - if (getSystemProperty("os.name").startsWith("OS/400")) { - return; - } - // Test chinese database name. ConnectionPoolDataSource ds = J2EEDataSource.getConnectionPoolDataSource(); J2EEDataSource.setBeanProperty(ds, "databaseName", "\u4e10");