Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 90651 invoked from network); 16 Oct 2008 20:23:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Oct 2008 20:23:01 -0000 Received: (qmail 7007 invoked by uid 500); 16 Oct 2008 20:23:03 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 6986 invoked by uid 500); 16 Oct 2008 20:23:03 -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 6977 invoked by uid 99); 16 Oct 2008 20:23:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 13:23:02 -0700 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; Thu, 16 Oct 2008 20:22:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ECC7B238898E; Thu, 16 Oct 2008 13:22:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r705349 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java Date: Thu, 16 Oct 2008 20:22:10 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081016202210.ECC7B238898E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Thu Oct 16 13:22:10 2008 New Revision: 705349 URL: http://svn.apache.org/viewvc?rev=705349&view=rev Log: Change encryptedDatabase decorator to return empty test suite for encryptedDatabase decorator for JSR169. This was needed for DERBY-1764 so stress multi encryption test will not run with encryption and JSR169. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java?rev=705349&r1=705348&r2=705349&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java Thu Oct 16 13:22:10 2008 @@ -26,6 +26,7 @@ import javax.sql.DataSource; import junit.framework.Test; +import junit.framework.TestSuite; /** * Utility class that provides static methods to decorate tests. @@ -60,6 +61,9 @@ */ public static Test encryptedDatabase(Test test) { + if (JDBC.vmSupportsJSR169()) + return new TestSuite("no encryption support"); + test = new BaseTestSetup(test) { /**