db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r289989 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNetClient/checkDriver.out tests/jdbcapi/checkDriver.java
Date Sun, 18 Sep 2005 22:27:54 GMT
Author: kmarsden
Date: Sun Sep 18 15:27:48 2005
New Revision: 289989

URL: http://svn.apache.org/viewcvs?rev=289989&view=rev
Log:
DERBY-530 

Addtional test checkin to fix output on non-windows platforms


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out?rev=289989&r1=289988&r2=289989&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDriver.out
Sun Sep 18 15:27:48 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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java?rev=289989&r1=289988&r2=289989&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDriver.java
Sun Sep 18 15:27:48 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());
 	}
 	
 }



Mime
View raw message