db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1300754 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/store/ java/testin...
Date Wed, 14 Mar 2012 22:11:36 GMT
Author: kmarsden
Date: Wed Mar 14 22:11:35 2012
New Revision: 1300754

URL: http://svn.apache.org/viewvc?rev=1300754&view=rev
Log:
DERBY-2687 store/encryptDatabase.sql fails intermittently with ClassNotFoundException, 
Log Corrupted
Contributed by Dag H Wanvik merged revsion 1292084  from trunk


Added:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
      - copied unchanged from r1292084, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
Removed:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/master/encryptDatabase.out
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.properties
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionAES.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase.sql
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/encryptDatabase_app.properties
Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/Decorator.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 14 22:11:35 2012
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
 1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1243878,1292109,1293494,1294512,1294522,1295085,1300658
+/db/derby/code/trunk:1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,1181756,
 1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1236887,1239898,1241841,1242098,1242409,1242413,1242460,1242610,1243878,1292084,1292109,1293494,1294512,1294522,1295085

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.runall
Wed Mar 14 22:11:35 2012
@@ -1,3 +1,2 @@
 unit/T_Cipher.unit
-store/encryptDatabase.sql
 store/EncryptionTest.java

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionBlowfish.runall
Wed Mar 14 22:11:35 2012
@@ -1,2 +1 @@
 unit/T_CipherBlowfish.unit
-store/encryptDatabase.sql

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionCFB.runall
Wed Mar 14 22:11:35 2012
@@ -1,2 +1 @@
 unit/T_CipherCFB.unit
-store/encryptDatabase.sql

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionDES.runall
Wed Mar 14 22:11:35 2012
@@ -1,2 +1 @@
 unit/T_CipherDES.unit
-store/encryptDatabase.sql

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionECB.runall
Wed Mar 14 22:11:35 2012
@@ -1,2 +1 @@
 unit/T_CipherECB.unit
-store/encryptDatabase.sql

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/encryptionOFB.runall
Wed Mar 14 22:11:35 2012
@@ -1,2 +1 @@
 unit/T_CipherOFB.unit
-store/encryptDatabase.sql

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
Wed Mar 14 22:11:35 2012
@@ -89,6 +89,7 @@ public class _Suite extends BaseTestCase
             suite.addTest(EncryptionKeyBlowfishTest.suite());
             suite.addTest(EncryptionKeyDESTest.suite());
             suite.addTest(EncryptionAESTest.suite());
+            suite.addTest(EncryptDatabaseTest.suite());
         }
         
         return suite;

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/Decorator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/Decorator.java?rev=1300754&r1=1300753&r2=1300754&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/Decorator.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/Decorator.java
Wed Mar 14 22:11:35 2012
@@ -57,16 +57,36 @@ public class Decorator {
      */
     public static Test encryptedDatabase(Test test)
     {
+        return encryptedDatabaseBpw(test, getBootPhrase(16));
+    }
+
+    /**
+     * Decorate a set of tests to use an encrypted
+     * single use database. This is to run tests
+     * using encryption as a general test and
+     * not specific tests of how encryption is handled.
+     * E.g. tests of setting various URL attributes
+     * would be handled in a specific test.
+     * <BR>
+     * The database will use the default encryption
+     * algorithm.
+     * 
+     * @param test test to decorate
+     * @param bootPassword boot passphrase to use
+     * @return decorated tests
+     */
+    public static Test encryptedDatabaseBpw(Test test, String bootPassword)
+    {
         if (JDBC.vmSupportsJSR169())
             return new TestSuite("no encryption support");
 
         Properties attributes = new Properties();
         attributes.setProperty("dataEncryption", "true");
-        attributes.setProperty("bootPassword", getBootPhrase(16));
+        attributes.setProperty("bootPassword", bootPassword);
 
         return attributesDatabase(attributes, test);
     }
-    
+
     /**
      * Decorate a set of tests to use an encrypted
      * single use database. This is to run tests
@@ -86,14 +106,37 @@ public class Decorator {
      */
     public static Test encryptedDatabase(Test test, final String algorithm)
     {
+        return encryptedDatabaseBpw(test, algorithm, getBootPhrase(16));
+    }
+
+
+    /**
+     * Decorate a set of tests to use an encrypted
+     * single use database. This is to run tests
+     * using encryption as a general test and
+     * not specific tests of how encryption is handled.
+     * E.g. tests of setting various URL attributes
+     * would be handled in a specific test.
+     * <BR>
+     * The database will use the specified encryption
+     * algorithm.
+     * 
+     * @param test test to decorate
+     * @param bootPassword boot passphrase to use
+     * @return decorated tests
+     */
+    public static Test encryptedDatabaseBpw(Test test,
+                                            final String algorithm,
+                                            String bootPassword)
+    {
         Properties attributes = new Properties();
         attributes.setProperty("dataEncryption", "true");
-        attributes.setProperty("bootPassword", getBootPhrase(64));
+        attributes.setProperty("bootPassword", bootPassword);
         attributes.setProperty("encryptionAlgorithm", algorithm);
 
         return attributesDatabase(attributes, test);
     }
-    
+
     private static String getBootPhrase(int length)
     {
         Random rand = new Random();



Mime
View raw message