db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1465430 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
Date Sun, 07 Apr 2013 17:18:52 GMT
Author: kmarsden
Date: Sun Apr  7 17:18:52 2013
New Revision: 1465430

URL: http://svn.apache.org/r1465430
Log:
DERBY-5342 make ScriptTestCase support "ij.showNoCountForSelect" and "ij.showNoConnectionsAtStart"

merge to 10.8 to facilitate upgrade and compatibility testing
Contributed by Houx Zhang


Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1152371,1185330,1185465

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java?rev=1465430&r1=1465429&r2=1465430&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
Sun Apr  7 17:18:52 2013
@@ -95,7 +95,8 @@ public abstract class ScriptTestCase ext
             String inputEnc, String outputEnc, String user)
     {
         super(script, outputEnc);
-
+        setSystemProperty("ij.showNoConnectionsAtStart", "true");
+        setSystemProperty("ij.showNoCountForSelect", "true");
         inputEncoding = (inputEnc == null) ? DEFAULT_ENCODING : inputEnc;
 
 		this.user = user;

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java?rev=1465430&r1=1465429&r2=1465430&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
Sun Apr  7 17:18:52 2013
@@ -127,9 +127,8 @@ public class SystemPropertyTestSetup ext
                 // set, might need to be changed.
                 change = !old.equals(value);
                 
-                // If we are not processing the oldValues
-                // then store in the oldValues. Reference equality is ok here.
-    			if (change && (values != oldValues))
+                //Reference equality is ok here.
+    			if (values != oldValues)
     			   oldValues.setProperty(key, old);
     		}
     		else {



Mime
View raw message