db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r399293 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNet/jdk16/ master/DerbyNetClient/ master/DerbyNetClient/jdk16/ tests/jdbcapi/
Date Wed, 03 May 2006 13:20:03 GMT
Author: rhillegas
Date: Wed May  3 06:20:00 2006
New Revision: 399293

URL: http://svn.apache.org/viewcvs?rev=399293&view=rev
Log:
DERBY-955: Commit bug955_blobclob4BLOB.diff. This converts a printout to an assertion in the
blobclob4BLOB test and eliminates two more jdk16-specific canons.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/blobclob4BLOB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/blobclob4BLOB.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out?rev=399293&r1=399292&r2=399293&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
Wed May  3 06:20:00 2006
@@ -771,9 +771,7 @@
 clobTestSelfDestructive2 finished
 START: clobNegativeTest_Derby265
 -----
-EXPECTED SQLSTATE(XCL30): An IOException was thrown when reading a 'java.sql.String' from
an InputStream. SQLSTATE: XJ001: Java exception: 'ERROR 40XD0: Container has been closed:
java.io.IOException'.
 START: blobTestNegativeTest_Derby265
 -----
-EXPECTED SQLSTATE(XCL30): An IOException was thrown when reading a 'BLOB' from an InputStream.
SQLSTATE: XJ001: Java exception: 'ERROR 40XD0: Container has been closed: java.io.IOException'.
 FINISHED TEST blobclob :-)
 Test blobclob finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out?rev=399293&r1=399292&r2=399293&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
Wed May  3 06:20:00 2006
@@ -770,9 +770,7 @@
 clobTestSelfDestructive2 finished
 START: clobNegativeTest_Derby265
 -----
-EXPECTED SQLSTATE(XCL30): An IOException was thrown when reading a 'java.sql.String' from
an InputStream. SQLSTATE: XJ001: Java exception: 'ERROR 40XD0: Container has been closed:
java.io.IOException'.
 START: blobTestNegativeTest_Derby265
 -----
-EXPECTED SQLSTATE(XCL30): An IOException was thrown when reading a 'BLOB' from an InputStream.
SQLSTATE: XJ001: Java exception: 'ERROR 40XD0: Container has been closed: java.io.IOException'.
 FINISHED TEST blobclob :-)
 Test blobclob finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=399293&r1=399292&r2=399293&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
Wed May  3 06:20:00 2006
@@ -836,9 +836,7 @@
 EXPECTED IO Exception:ERROR 40XD0: Container has been closed
 START: clobNegativeTest_Derby265
 -----------------------------
-EXPECTED SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB
or CLOBs transaction may be committed, or its connection is closed.
 START: blobTestNegativeTest_Derby265
 -----------------------------
-EXPECTED SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB
or CLOBs transaction may be committed, or its connection is closed.
 FINISHED TEST blobclob :-)
 Test blobclob finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java?rev=399293&r1=399292&r2=399293&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
Wed May  3 06:20:00 2006
@@ -4077,7 +4077,7 @@
         	String sqlstate = sqle.getSQLState();
         	boolean expected = (sqlstate != null && 
         				(sqlstate.equals("XJ073") || sqlstate.equals("XCL30")));
-            	TestUtil.dumpSQLExceptions(sqle,expected);            	
+			if ( !expected ) { TestUtil.dumpSQLExceptions(sqle,expected); }         	
         }
         finally {
             rs2.close();
@@ -4147,7 +4147,7 @@
         	String sqlstate = sqle.getSQLState();
         	boolean expected = (sqlstate != null && 
         				(sqlstate.equals("XJ073") || sqlstate.equals("XCL30")));
-            	TestUtil.dumpSQLExceptions(sqle,expected);
+			if ( !expected ) { TestUtil.dumpSQLExceptions(sqle,expected); }
         }	
         finally {
             rs2.close();



Mime
View raw message