You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2014/06/12 10:50:46 UTC
svn commit: r1602094 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting:
functionTests/tests/jdbc4/XA40Test.java functionTests/tests/jdbc4/_Suite.java
functionTests/tests/jdbcapi/BatchUpdateTest.java junit/BaseTestCase.java
Author: kahatlen
Date: Thu Jun 12 08:50:46 2014
New Revision: 1602094
URL: http://svn.apache.org/r1602094
Log:
DERBY-6614: Enable JDBC 4.2 tests on Java 9 and higher
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java?rev=1602094&r1=1602093&r2=1602094&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java Thu Jun 12 08:50:46 2014
@@ -22,6 +22,7 @@ package org.apache.derbyTesting.function
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.J2EEDataSource;
+import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.TestConfiguration;
import junit.framework.*;
@@ -195,7 +196,7 @@ public class XA40Test extends BaseJDBCTe
*/
public void test_registerOutParameter_jdbc4_2() throws Exception
{
- if ( isJava8() )
+ if (JDBC.vmSupportsJDBC42())
{
Class<?> klass = Class.forName( "org.apache.derbyTesting.functionTests.tests.jdbc4.PreparedStatementTest42" );
Method method = klass.getMethod( "registerObjectTest", new Class<?>[] { Connection.class } );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java?rev=1602094&r1=1602093&r2=1602094&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java Thu Jun 12 08:50:46 2014
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
import java.sql.SQLException;
import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.JDBC;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -80,7 +81,7 @@ public class _Suite extends BaseTestCase
suite.addTest(Driver40UnbootedTest.suite());
suite.addTest(LoginTimeoutTest.suite());
- if ( isJava8() )
+ if (JDBC.vmSupportsJDBC42())
{
suite.addTest( getSuite( "org.apache.derbyTesting.functionTests.tests.jdbc4.PreparedStatementTest42" ) );
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java?rev=1602094&r1=1602093&r2=1602094&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java Thu Jun 12 08:50:46 2014
@@ -212,7 +212,7 @@ public class BatchUpdateTest extends Bas
{
assertBatchUpdateCounts( squashLongs( expectedBatchResult ), bue.getUpdateCounts() );
- if ( isJava8() )
+ if (JDBC.vmSupportsJDBC42())
{
BatchUpdateExceptionWrapper wrapper = new BatchUpdateExceptionWrapper( bue );
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1602094&r1=1602093&r2=1602094&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Thu Jun 12 08:50:46 2014
@@ -867,10 +867,6 @@ public abstract class BaseTestCase
return getSystemProperty("java.version").startsWith("1.7");
}
- public static final boolean isJava8() {
- return getSystemProperty("java.version").startsWith("1.8");
- }
-
public static final boolean runsWithEmma() {
return getSystemProperty("java.class.path").indexOf("emma.jar") != -1;
}