db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1446698 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
Date Fri, 15 Feb 2013 17:23:32 GMT
Author: rhillegas
Date: Fri Feb 15 17:23:31 2013
New Revision: 1446698

URL: http://svn.apache.org/r1446698
Log:
DERBY-6073: Adjust StatementPoolingTest to account for class names introduced by JDBC 4.2.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java?rev=1446698&r1=1446697&r2=1446698&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
Fri Feb 15 17:23:31 2013
@@ -140,7 +140,15 @@ public class StatementPoolingTest
         String[] names = obj.getClass().getName().split("\\.");
         final String simpleName = names[names.length -1];
         if (JDBC.vmSupportsJDBC4() && !expectedName.endsWith("40")) {
-            expectedName += "40";
+
+            if ( isJava8() && expectedName.contains( "Statement" ) )
+            {
+                expectedName += "42";
+            }
+            else
+            {
+                expectedName += "40";
+            }
         }
         assertEquals(expectedName, simpleName);
     }



Mime
View raw message