Author: fuzzylogic
Date: Wed Oct  5 09:55:56 2005
New Revision: 295037

URL: http://svn.apache.org/viewcvs?rev=295037&view=rev
Log:
DERBY-238: Fix propogation of testEncryptionAlgorithm property.

Committed for Myrna Van Lunteren <m.v.lunteren@gmail.com>

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=295037&r1=295036&r2=295037&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java Wed Oct  5 09:55:56 2005
@@ -78,6 +78,7 @@
 	static String keepfiles = "false";
 	static String encryption;
 	static String testEncryptionProvider;
+	static String testEncryptionAlgorithm;
 	static String jdk12test;
 	static String jdk12exttest;
 	static String jdk14test;
@@ -388,6 +389,8 @@
             jvmProps.addElement("encryption=" + encryption);
         if (testEncryptionProvider != null)
             jvmProps.addElement("testEncryptionProvider=" + testEncryptionProvider);
+        if (testEncryptionAlgorithm != null)
+            jvmProps.addElement("testEncryptionAlgorithm=" + testEncryptionAlgorithm);
         if (jdk12test != null)
             jvmProps.addElement("jdk12test=" + jdk12test);
         if (jdk12exttest != null)
@@ -620,6 +623,7 @@
             // And do the same for encryption
             encryption = parentProps.getProperty("encryption");
             testEncryptionProvider = parentProps.getProperty("testEncryptionProvider");
+            testEncryptionAlgorithm = parentProps.getProperty("testEncryptionAlgorithm");
             // And do the same for jdk12test
             jdk12test = parentProps.getProperty("jdk12test");
             jdk12exttest = parentProps.getProperty("jdk12exttest");
@@ -716,6 +720,7 @@
 		useoutput = suiteProperties.getProperty("useoutput");
 		encryption = suiteProperties.getProperty("encryption");
 		testEncryptionProvider = suiteProperties.getProperty("testEncryptionProvider");
+		testEncryptionAlgorithm = suiteProperties.getProperty("testEncryptionAlgorithm");
 		jdk12test = suiteProperties.getProperty("jdk12test");
 		jdk12exttest = suiteProperties.getProperty("jdk12exttest");
 		jdk14test = suiteProperties.getProperty("jdk14test");
@@ -830,6 +835,12 @@
 		    p.put("testEncryptionProvider", testEncryptionProvider);
 		else
             testEncryptionProvider = p.getProperty("testEncryptionProvider");
+
+	// Encryption algorithm may be set at the top or just for a subsuite
+	    if ( parentProperties.getProperty("testEncryptionAlgorithm") != null )
+		    p.put("testEncryptionAlgorithm", testEncryptionAlgorithm);
+		else
+            testEncryptionAlgorithm = p.getProperty("testEncryptionAlgorithm");
 
         // jdk12test may be set at the top or just for a subsuite
 	    if ( parentProperties.getProperty("jdk12test") != null )

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java?rev=295037&r1=295036&r2=295037&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunSuite.java Wed Oct  5 09:55:56 2005
@@ -57,6 +57,7 @@
 	static String classpath;
 	static String classpathServer;
 	static String testJavaFlags = ""; // formerly systest_javaflags
+	static String testSpecialProps = ""; 
 	static String userdir;
 	static String framework;
 	static String runwithibmjvm;
@@ -309,6 +310,7 @@
             javaCmd = p.getProperty("javaCmd");
             jvmflags = p.getProperty("jvmflags");
             testJavaFlags = p.getProperty("testJavaFlags");
+            testSpecialProps = p.getProperty("testSpecialProps");
             classpath = p.getProperty("classpath");
             classpathServer = p.getProperty("classpathServer");
             framework = p.getProperty("framework");
@@ -393,6 +395,15 @@
 		        testJavaFlags = testJavaFlags + "^" + testflags;
 		    suiteProperties.put("testJavaFlags", testJavaFlags);
 		}
+		String testprops = sp.getProperty("testSpecialProps");
+		if (testprops != null)
+		{
+		    if (testSpecialProps == null)
+		        testSpecialProps = testflags;
+		    else // add to testSpecialProps
+		        testSpecialProps = testSpecialProps + "^" + testprops;
+		    suiteProperties.put("testSpecialProps", testSpecialProps);
+		}
 		String clpth = sp.getProperty("classpath");
 		if (clpth != null)
 		{
@@ -420,6 +431,9 @@
 		String encrypt = sp.getProperty("encryption");
 		if (encrypt != null)
 		    suiteProperties.put("encryption", encrypt);
+		String encryptAlgorithm = sp.getProperty("testEncryptionAlgorithm");
+		if (encryptAlgorithm != null)
+		    suiteProperties.put("testEncryptionAlgorithm", encryptAlgorithm);
 		String jdk12test = sp.getProperty("jdk12test");
 		if (jdk12test != null)
 		    suiteProperties.put("jdk12test", jdk12test);