Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 69930 invoked from network); 20 Sep 2005 00:02:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Sep 2005 00:02:06 -0000 Received: (qmail 23932 invoked by uid 500); 20 Sep 2005 00:02:06 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 23872 invoked by uid 500); 20 Sep 2005 00:02:06 -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 23859 invoked by uid 99); 20 Sep 2005 00:02:05 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 19 Sep 2005 17:02:05 -0700 Received: (qmail 69808 invoked by uid 65534); 20 Sep 2005 00:01:05 -0000 Message-ID: <20050920000105.69807.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r290316 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNetClient/checkDriver.out tests/jdbcapi/checkDriver.java Date: Tue, 20 Sep 2005 00:01:04 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kmarsden Date: Mon Sep 19 17:00:57 2005 New Revision: 290316 URL: http://svn.apache.org/viewcvs?rev=290316&view=rev Log: DERBY-530 Merge from trunk (289989) Addtional test checkin to fix output on non-windows platforms Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out?rev=290316&r1=290315&r2=290316&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out (original) +++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out Mon Sep 19 17:00:57 2005 @@ -32,13 +32,13 @@ CURRENT SCHEMA = TESTUSER Expected Exception:08006:DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'testcreatedb1' shutdown. testClientAttributes() -Connection info for connect(jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]\trace.out, {}) -getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]\trace.out +Connection info for connect(jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out, {}) +getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace.out getUserName() = APP CURRENT SCHEMA = APP trace file exists -Connection info for connect(jdbc:derby://localhost:1527/testpropdb, {traceFile=[DERBY_SYSTEM_HOME]\trace2.out}) -getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]\trace2.out +Connection info for connect(jdbc:derby://localhost:1527/testpropdb, {traceFile=[DERBY_SYSTEM_HOME]/trace2.out}) +getURL() = jdbc:derby://localhost:1527/testpropdb;traceFile=[DERBY_SYSTEM_HOME]/trace2.out getUserName() = APP CURRENT SCHEMA = APP trace file exists Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java?rev=290316&r1=290315&r2=290316&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java (original) +++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java Mon Sep 19 17:00:57 2005 @@ -360,12 +360,13 @@ * @return origString with derby.system.home path replaed with [DERBY_SYSTEM_HOME] */ private static String replaceSystemHome(String origString) { - int offset = origString.indexOf(DERBY_SYSTEM_HOME); + String replaceString = DERBY_SYSTEM_HOME + File.separator; + int offset = origString.indexOf(replaceString); if (offset == -1) return origString; else - return origString.substring(0,offset) + "[DERBY_SYSTEM_HOME]"+ - origString.substring(offset + DERBY_SYSTEM_HOME.length()); + return origString.substring(0,offset) + "[DERBY_SYSTEM_HOME]/"+ + origString.substring(offset + replaceString.length()); } }