svn commit: r1005285 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java

[my...@apache.org]

Author: myrnavl
Date: Wed Oct  6 23:03:50 2010
New Revision: 1005285

URL: http://svn.apache.org/viewvc?rev=1005285&view=rev
Log:
DERBY-4836; many test failures on windows with ibm 1.5 and 1.6 on windows after test InternationalConnectTest
  skipping over the test with ibm jvms while investigating.

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=1005285&r1=1005284&r2=1005285&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 Wed Oct  6 23:03:50 2010
@@ -32,6 +32,7 @@ import javax.sql.XAConnection;
 import javax.sql.XADataSource;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.J2EEDataSource;
@@ -239,6 +240,15 @@ public class InternationalConnectTest ex
     }
     
     public static Test suite() {
+        
+        if (! isSunJVM()) {
+            TestSuite suite = new TestSuite("InternationalConnectTest with non-sun/oracle jvm");
+            // DERBY-4836 test fails on IBM VMs (on windows). 
+            // Skip while research is happening..
+            println("Test skipped for this VM, cf. DERBY-4836");
+            return suite;            
+        }
+        
         return TestConfiguration.defaultSuite(InternationalConnectTest.class);
     }