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 rh...@apache.org on 2006/04/18 16:16:13 UTC
svn commit: r394952 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
harness/Sed.java master/jdk16/dblook_test.out
Author: rhillegas
Date: Tue Apr 18 07:16:08 2006
New Revision: 394952
URL: http://svn.apache.org/viewcvs?rev=394952&view=rev
Log:
DERBY-955: eliminate another set of derbyall diffs under jdk1.6.
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/dblook_test.out
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=394952&r1=394951&r2=394952&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Tue Apr 18 07:16:08 2006
@@ -191,6 +191,11 @@
searchStrings.addElement("java.sql.SQLTransactionRollbackException:");
searchStrings.addElement("java.sql.SQLTransientConnectionException:");
searchStrings.addElement("java.sql.SQLTransientException:");
+
+ // The JDBC4 error from the driver is a little chattier
+ searchStrings.addElement("No suitable driver found for [0-9A-Za-z:]*");
+ searchStrings.addElement("No suitable driver;[0-9A-Za-z:=]*");
+ searchStrings.addElement("SQL Exception: No suitable driver");
}
Vector subStrings = new Vector();
@@ -248,6 +253,10 @@
subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
+
+ subStrings.addElement("No suitable driver");
+ subStrings.addElement("No suitable driver");
+ subStrings.addElement("java.sql.SQLException: No suitable driver");
}
doWork(srcFile, dstFile, null, deleteLines, searchStrings, subStrings, isSed, isI18N);