db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r409420 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/RunList.java harness/RunTest.java util/TestConfiguration.java
Date Thu, 25 May 2006 18:10:40 GMT
Author: rhillegas
Date: Thu May 25 11:10:40 2006
New Revision: 409420

URL: http://svn.apache.org/viewvc?rev=409420&view=rev
Log:
DERBY-1214: Commit Anurag's derby-1214_3.diff, changing the name of a test harness property.

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/RunTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunList.java?rev=409420&r1=409419&r2=409420&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
Thu May 25 11:10:40 2006
@@ -119,7 +119,7 @@
 	static BufferedReader runlistFile;
 	static String hostName;
 	static String testEncoding;	// Encoding used for child jvm and to read the test output 
-    static String junitxasingle;// Run junit test cases with under 
+    static String derbyTestingXaSingle;// Run junit test cases with under 
                                 // single branck xa transaction
 	
     static String [] clientExclusionKeywords = new String [] {
@@ -443,8 +443,8 @@
         else if (otherSpecialProps.length()>0)
             jvmProps.addElement("testSpecialProps=" + otherSpecialProps);
             
-        if (junitxasingle != null)
-            jvmProps.addElement ("junit.xa.single=" + junitxasingle);
+        if (derbyTestingXaSingle != null)
+            jvmProps.addElement ("derbyTesting.xa.single=" + derbyTestingXaSingle);
         
         // Ensure any properties that define the default connection
         // for the tests to use a DataSource are passed from the
@@ -762,7 +762,7 @@
 		jdk12exttest = suiteProperties.getProperty("jdk12exttest");
 		runwithibmjvm = suiteProperties.getProperty("runwithibmjvm");
 		runwithj9 = suiteProperties.getProperty("runwithj9");
-                junitxasingle = suiteProperties.getProperty("junit.xa.single");
+                derbyTestingXaSingle = suiteProperties.getProperty("derbyTesting.xa.single");
         String testJVM = jvmName;
         if (jvmName.startsWith("j9"))
         	testJVM = (jvmName.equals("j9_foundation") ? "foundation" : "j9");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=409420&r1=409419&r2=409420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Thu May 25 11:10:40 2006
@@ -904,7 +904,7 @@
 			framework = "";
 		else
 			driverName = NetServer.getDriverName(framework);
-        String junitXAProp = sp.getProperty ("junit.xa.single");
+        String junitXAProp = sp.getProperty ("derbyTesting.xa.single");
         if (junitXAProp != null && junitXAProp.equals ("true")) {
             junitXASingle = true;
         }
@@ -2206,7 +2206,7 @@
         }
         
         if (junitXASingle)
-            jvmProps.addElement ("junit.xa.single=true");
+            jvmProps.addElement ("derbyTesting.xa.single=true");
 
         // if we're not jdk15, don't, we'll skip
         if ((testEncoding != null) && (jvmName.equals("jdk15")))

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java?rev=409420&r1=409419&r2=409420&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestConfiguration.java
Thu May 25 11:10:40 2006
@@ -272,7 +272,7 @@
     private final static String KEY_HOSTNAME = "hostName";
     private final static String KEY_PORT = "port";
     private final static String KEY_VERBOSE = "derby.tests.debug";    
-    private final static String KEY_SINGLE_LEG_XA = "junit.xa.single";
+    private final static String KEY_SINGLE_LEG_XA = "derbyTesting.xa.single";
 
     /**
      * Possible values of system properties.



Mime
View raw message