db-derby-commits mailing list archives

Author: myrnavl
Date: Thu Jan 13 18:51:24 2011
New Revision: 1058707

URL: http://svn.apache.org/viewvc?rev=1058707&view=rev
Log:
DERBY-4149; test failure in jdbcapi.InternationalConnectSimpleDSTest 
  - skipping the fixtures in InternationalConnectSimpleDSTest and 
    InternationalConnectTest 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=1058707&r1=1058706&r2=1058707&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
Thu Jan 13 18:51:24 2011
@@ -27,6 +27,7 @@ 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;
@@ -101,6 +102,14 @@ 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=1058707&r1=1058706&r2=1058707&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
Thu Jan 13 18:51:24 2011
@@ -83,6 +83,15 @@ public class InternationalConnectTest ex
             if (isSunJVM() && 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;
@@ -139,6 +148,15 @@ 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;
+        }
+        
         //get a connection to load the driver
         getConnection();
         Connection conn = null;
@@ -180,6 +198,15 @@ public class InternationalConnectTest ex
      * @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;
+        }
+        
         // Test chinese database name.
         XADataSource ds = J2EEDataSource.getXADataSource();
         J2EEDataSource.setBeanProperty(ds, "databaseName", "\u4e10");
@@ -211,6 +238,15 @@ 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");
@@ -244,6 +280,7 @@ public class InternationalConnectTest ex
      * least one non-ascii character.
      */
     public void testFailureOnNonExistentDatabase() throws SQLException {
+        
         String url = TestConfiguration.getCurrent().getJDBCUrl(
                 "abcdefghijklmnopq\u00E5");
         try {