Author: kmarsden
Date: Tue Nov 18 10:17:24 2008
New Revision: 718671
URL: http://svn.apache.org/viewvc?rev=718671&view=rev
Log:
DERBY-1840 lang/TimeHandling.junit test fails on jdk13 vms
Disable test with jdk 1.3.1
Modified:
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java?rev=718671&r1=718670&r2=718671&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
Tue Nov 18 10:17:24 2008
@@ -37,6 +37,7 @@
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
public class TimeHandlingTest extends BaseJDBCTestCase {
@@ -68,6 +69,8 @@
public static Test suite()
{
+ if (! JDBC.vmAtLeastJDBC3())
+ return new TestSuite("Do not run test with jdk13. DERBY-1840");
TestSuite suite = new TestSuite(TimeHandlingTest.class);
return new CleanDatabaseTestSetup(suite) {
Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java?rev=718671&r1=718670&r2=718671&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/junit/JDBC.java Tue Nov
18 10:17:24 2008
@@ -42,6 +42,12 @@
*/
private static final boolean HAVE_SAVEPOINT
= haveClass("java.sql.Savepoint");
+
+ /** Does the ParameterMetaData class exist? Indicates
+ * At least JDK1.4
+ */
+ private static final boolean HAVE_PARAMETER_METADATA =
+ haveClass("java.sql.ParameterMetaData");
/**
* Does the java.sql.SQLXML class exist, indicates JDBC 4.
@@ -106,7 +112,12 @@
{
return !HAVE_DRIVER
&& HAVE_SAVEPOINT;
- }
+ }
+
+ public static boolean vmAtLeastJDBC3() {
+ return HAVE_PARAMETER_METADATA;
+ }
+
/**
* Rollback and close a connection for cleanup.
|