db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
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 GMT
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;
         }
         
         /*



Mime
View raw message