Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 43997 invoked from network); 18 Nov 2008 18:18:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Nov 2008 18:18:15 -0000 Received: (qmail 15041 invoked by uid 500); 18 Nov 2008 18:18:24 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 14971 invoked by uid 500); 18 Nov 2008 18:18:23 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 14962 invoked by uid 99); 18 Nov 2008 18:18:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2008 10:18:23 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2008 18:17:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E7E8E23888AF; Tue, 18 Nov 2008 10:17:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718671 - in /db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting: functionTests/tests/lang/TimeHandlingTest.java junit/JDBC.java Date: Tue, 18 Nov 2008 18:17:24 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081118181724.E7E8E23888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.