DERBY-530

Addtional test checkin to fix output on non-windows platforms git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@289989 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 18, 2005 · fd24a75 · fd24a75
1 parent 90f1614
commit fd24a75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out b/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
@@ -32,13 +32,13 @@ getUserName() = testuser
 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
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java
@@ -360,12 +360,13 @@ private static void testConnect(Driver driver, String url, Properties info) thro
 	 * @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());
 	}
 
 }