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 dj...@apache.org on 2007/03/19 16:00:03 UTC

svn commit: r519967 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java

Author: djd
Date: Mon Mar 19 08:00:02 2007
New Revision: 519967

URL: http://svn.apache.org/viewvc?view=rev&rev=519967
Log:
DERBY-2217 Make sure the encryption fixtures do not run in J2ME for the Upgrade test.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java?view=diff&rev=519967&r1=519966&r2=519967
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java Mon Mar 19 08:00:02 2007
@@ -57,6 +57,13 @@
         
         suite.addTestSuite(Changes10_2.class);
         
+        // Encryption only support on J2SE or higher.
+        if (JDBC.vmSupportsJDBC3())
+        {
+            suite.addTest(new Changes10_2("changeEncryptionFromNone"));
+            suite.addTest(new Changes10_2("changeEncryptionFromEncryptedDatabase"));
+        }
+        
         return suite;
     }
 
@@ -346,7 +353,7 @@
      * @throws SQLException
      */
 
-    public void testChangeEncryptionFromNone() throws SQLException
+    public void changeEncryptionFromNone() throws SQLException
     {
         DataSource ds = JDBCDataSource.getDataSourceLogical("NO_ENCRYPT_10_2");
         
@@ -418,7 +425,7 @@
      * @throws SQLException
      */
 
-    public void testChangeEncryptionFromEncryptedDatabase() throws SQLException
+    public void changeEncryptionFromEncryptedDatabase() throws SQLException
     {
         DataSource ds = JDBCDataSource.getDataSourceLogical("ENCRYPT_10_2");