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 km...@apache.org on 2008/10/16 22:22:10 UTC

svn commit: r705349 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Decorator.java

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) {
             
             /**