You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2005/09/20 02:01:04 UTC
svn commit: r290316 - in
/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests:
master/DerbyNetClient/checkDriver.out tests/jdbcapi/checkDriver.java
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());
}
}