Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 3590 invoked from network); 18 May 2010 03:26:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 May 2010 03:26:10 -0000 Received: (qmail 12639 invoked by uid 500); 18 May 2010 03:26:10 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 12568 invoked by uid 500); 18 May 2010 03:26:08 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 12561 invoked by uid 99); 18 May 2010 03:26:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 03:26:08 +0000 X-ASF-Spam-Status: No, hits=-1572.0 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 03:26:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED29823888EA; Tue, 18 May 2010 03:25:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r945472 - in /db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests: master/ master/ibm15/ master/j9_13/ tests/derbynet/ tests/tools/ Date: Tue, 18 May 2010 03:25:45 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100518032545.ED29823888EA@eris.apache.org> Author: myrnavl Date: Tue May 18 03:25:45 2010 New Revision: 945472 URL: http://svn.apache.org/viewvc?rev=945472&view=rev Log: DERBY-4536; backporting fixes of DERBY-858 from 10.5 to 10.4 so tests are not affected by hash table ordering changes. Merge command: svn -c merge 835482 https://svn.apache.org/repos/asf/db/derby/code/branches/10.5 Added: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ijConnName_sed.properties - copied unchanged from r835482, db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ijConnName_sed.properties Removed: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ibm15/ijConnName.out db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ij5.out db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/ijConnName.out Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ij5.out db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ijConnName.out db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5.sql db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij5_app.properties db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ijConnName.sql db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ijConnName_app.properties Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ij5.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ij5.out?rev=945472&r1=945471&r2=945472&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ij5.out (original) +++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ij5.out Tue May 18 03:25:45 2010 @@ -1,7 +1,6 @@ CONNONE* - jdbc:derby:wombat -CONNTWO - jdbc:derby:lemming * = current connection -ij(CONNONE)> -- +ij> -- -- Licensed to the Apache Software Foundation (ASF) under one or more -- contributor license agreements. See the NOTICE file distributed with -- this work for additional information regarding copyright ownership. @@ -17,7 +16,7 @@ ij(CONNONE)> -- -- See the License for the specific language governing permissions and -- limitations under the License. -- --- assumes the connections connOne, connTwo are set up already +-- assumes the connection connOne is set up already -- 1)at the startup time, it will list all the connections -- 2)select will now display number of rows selected select count(*) from sys.systables where 1=0; @@ -25,4 +24,4 @@ select count(*) from sys.systables where ----------- 0 1 row selected -ij(CONNONE)> +ij> Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ijConnName.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ijConnName.out?rev=945472&r1=945471&r2=945472&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ijConnName.out (original) +++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/ijConnName.out Tue May 18 03:25:45 2010 @@ -1,6 +1,4 @@ -ERROR XJ004: Database 'nevercreated' not found. -ERROR 08001: No suitable driver -ij(CONNONE)> -- +ij> -- -- Licensed to the Apache Software Foundation (ASF) under one or more -- contributor license agreements. See the NOTICE file distributed with -- this work for additional information regarding copyright ownership. @@ -16,14 +14,14 @@ ij(CONNONE)> -- -- See the License for the specific language governing permissions and -- limitations under the License. -- --- assumes the connections connOne, connTwo are set up already +-- assumes the connection connOne is set up already -- and that connThree, connFour failed to be setup correctly (bad URLs) -- expect connOne to be active show connections; CONNONE* - jdbc:derby:wombat -CONNTWO - jdbc:derby:lemming * = current connection -ij(CONNONE)> set connection connOne; +ij> connect 'jdbc:derby:lemming;create=true' as connTwo; +ij(CONNTWO)> set connection connOne; ij(CONNONE)> values 1; 1 ----------- Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java?rev=945472&r1=945471&r2=945472&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java (original) +++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Tue May 18 03:25:45 2010 @@ -215,8 +215,8 @@ public class ServerPropertiesTest exten ); return test; } - - private static void verifyProperties(String[] expectedValues) { + + private static Properties getTheProperties() { Properties p; try { p = NetworkServerTestSetup.getNetworkServerControl().getCurrentProperties(); @@ -226,23 +226,46 @@ public class ServerPropertiesTest exten e.printStackTrace(); fail("unexpected exception getting properties from server"); } - - Enumeration e = p.propertyNames(); + return p; + } + + // check for 1 Property/Value pair, passing in expected as a String + // "=" + private static void verifyProperties(String expectedPropAndValue) { + Properties p = getTheProperties(); + assertPropertyValueCorrect(p, expectedPropAndValue); + p=null; + } + + // check for an array of Property/Value pairs, passing each expected pair + // in as a String "=" + private static void verifyProperties(String[] expectedValues) { + Properties p = getTheProperties(); // for debugging: for (int i=0 ; i