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 rh...@apache.org on 2016/01/17 22:20:35 UTC
svn commit: r1725139 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
harness/JavaVersionHolder.java tests/jdbc4/UnsupportedVetter.java
Author: rhillegas
Date: Sun Jan 17 21:20:35 2016
New Revision: 1725139
URL: http://svn.apache.org/viewvc?rev=1725139&view=rev
Log:
DERBY-6854: Fix the tests so that they run on the early access build 100 of Java 9; tests ran cleanly for me on derby-6854-01-aa-fixFor9-ea.diff.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java?rev=1725139&r1=1725138&r2=1725139&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java Sun Jan 17 21:20:35 2016
@@ -38,11 +38,17 @@ public class JavaVersionHolder
public JavaVersionHolder(String javaVersion)
throws java.lang.NumberFormatException
{
- // check for jdk12 or higher
- int i = javaVersion.indexOf('.');
- int j = javaVersion.indexOf('.', i+1);
- majorVersion = javaVersion.substring(0, i);
- try
+ // handle early access versions of JDK 9
+ if (javaVersion.startsWith( "9" ))
+ {
+ javaVersion = "1.9.0";
+ }
+
+ // check for jdk12 or higher
+ int i = javaVersion.indexOf('.');
+ int j = javaVersion.indexOf('.', i+1);
+ majorVersion = javaVersion.substring(0, i);
+ try
{
Integer imajor = new Integer(majorVersion);
major = imajor.intValue();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java?rev=1725139&r1=1725138&r2=1725139&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java Sun Jan 17 21:20:35 2016
@@ -355,9 +355,12 @@ public class UnsupportedVetter extends B
public void testSupportedMethods()
throws Exception
{
- getTestConfiguration().setVerbosity( true );
+ getTestConfiguration().setVerbosity( true );
- if ( savedVerbosity ) { println( "Supports JDBC 4.2 = " + JDBC. vmSupportsJDBC42() ); }
+ // do not run on java 9. it introduces classes and methods not found in java 8.
+ if (vmAtLeast(1, 9)) { return; }
+
+ if ( savedVerbosity ) { println( "Supports JDBC 4.2 = " + JDBC. vmSupportsJDBC42() ); }
HashSet<String> vanishedMethodList = new HashSet<String>();
HashSet<String> unsupportedList = new HashSet<String>();
@@ -377,9 +380,9 @@ public class UnsupportedVetter extends B
printUnsupportedList( unsupportedList );
printNotUnderstoodList( notUnderstoodList );
- assertEquals( "vanishedMethodList", 0, vanishedMethodList.size() );
- assertEquals( "unsupportedList", 0, unsupportedList.size() );
- assertEquals( "notUnderstoodList", 0, notUnderstoodList.size() );
+ assertEquals( "vanishedMethodList", 0, vanishedMethodList.size() );
+ assertEquals( "unsupportedList", 0, unsupportedList.size() );
+ assertEquals( "notUnderstoodList", 0, notUnderstoodList.size() );
}
//