db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r663770 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/aes.out suites/encryptionAll.runall tests/store/EncryptionAESTest.java tests/store/_Suite.java tests/store/aes.sql tests/store/aes_app.properties
Date Thu, 05 Jun 2008 22:51:14 GMT
Author: myrnavl
Date: Thu Jun  5 15:51:14 2008
New Revision: 663770

URL: http://svn.apache.org/viewvc?rev=663770&view=rev
Log:
DERBY-3711 ; put EncryptionAESTest in store._Suite and remove old aes.sql test.
  patch DERBY-3711-2 contributed by me.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aes.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/aes_app.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall?rev=663770&r1=663769&r2=663770&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAll.runall
Thu Jun  5 15:51:14 2008
@@ -1,4 +1,3 @@
-store/aes.sql
 store/encryptParams.sql
 store/encryptDatabaseTest1.sql
 store/encryptDatabaseTest2.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java?rev=663770&r1=663769&r2=663770&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
Thu Jun  5 15:51:14 2008
@@ -211,8 +211,9 @@
         // Pop a message to the console and only test encryptionKeyLength 128.
         if (con == null)
         {
-            System.out.println("no unrestricted policy jars; cannot test AES " +
-                "encryption with encryptionKeyLengths 192 nor 256");
+            if (TestConfiguration.getCurrent().doTrace())
+                System.out.println("no unrestricted policy jars; cannot test AES " +
+                    "encryption with encryptionKeyLengths 192 nor 256");
             return;
         }
         validateDBContents(con);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java?rev=663770&r1=663769&r2=663770&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
Thu Jun  5 15:51:14 2008
@@ -60,6 +60,7 @@
             suite.addTest(EncryptionKeyAESTest.suite());
             suite.addTest(EncryptionKeyBlowfishTest.suite());
             suite.addTest(EncryptionKeyDESTest.suite());
+            suite.addTest(EncryptionAESTest.suite());
         }
         
         return suite;



Mime
View raw message