db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abr...@apache.org
Subject svn commit: r521401 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
Date Thu, 22 Mar 2007 18:41:18 GMT
Author: abrown
Date: Thu Mar 22 11:41:18 2007
New Revision: 521401

URL: http://svn.apache.org/viewvc?view=rev&rev=521401
Log:
DERBY-2264 (followup): Disable jdbcapi/DboPowersTest for JSR169 since
Derby does not support database encryption for that platform (per
the specification for JSR169 attached to DERBY-97).

Contributed by: Dag Wanvik (dag.wanvik@sun.com)

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java?view=diff&rev=521401&r1=521400&r2=521401
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
Thu Mar 22 11:41:18 2007
@@ -27,6 +27,7 @@
 import junit.framework.TestSuite;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -103,15 +104,26 @@
     {
         TestSuite suite = new TestSuite("DboPowersTest");
 
+        /* Database shutdown powers */
+
         suite.addTest(dboShutdownSuite("suite: shutdown powers, embedded"));
         suite.addTest(
             TestConfiguration.clientServerDecorator(
                 dboShutdownSuite("suite: shutdown powers, client")));
 
-        suite.addTest(dboEncryptionSuite("suite: encryption powers, embedded"));
-        suite.addTest(
-            TestConfiguration.clientServerDecorator(
-                dboEncryptionSuite("suite: encryption powers, client")));
+        /* Database (re)encryption powers
+         *
+         * The encryption power tests are not run for JSR169, since Derby
+         * does not support database encryption for that platform, cf.
+         * the specification for JSR169 support in DERBY-97.
+         */
+        if (!JDBC.vmSupportsJSR169()) {
+            suite.addTest(
+                dboEncryptionSuite("suite: encryption powers, embedded"));
+            suite.addTest(
+                TestConfiguration.clientServerDecorator(
+                    dboEncryptionSuite("suite: encryption powers, client")));
+        }
 
         return suite;
     }



Mime
View raw message