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 dj...@apache.org on 2007/03/09 05:08:17 UTC
svn commit: r516286 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/holdCursorIJ.out master/update.out tests/lang/CurrentOfTest.java
tests/lang/UpdatableResultSetTest.java
Author: djd
Date: Thu Mar 8 20:08:16 2007
New Revision: 516286
URL: http://svn.apache.org/viewvc?view=rev&rev=516286
Log:
DERBY-2380 (partial) Add the test changes for the change of PreparedStatement no longer bing a provider.
(missed from last commit). Changes are as a result of there is no such state as a closed
cursor, only open or non-existent, so no longer throw a cursor is closed message, but
instead a cursor not found error.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?view=diff&rev=516286&r1=516285&r2=516286
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Thu Mar 8 20:08:16 2007
@@ -277,7 +277,7 @@
-----------------------
ij> close jdk4;
ij> delete from t1 where current of jdk4;
-ERROR XCL07: Cursor 'JDK4' is closed. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'JDK4' not found. Verify that autocommit is OFF.
ij> select * from t1;
C11 |C12
-----------------------
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out?view=diff&rev=516286&r1=516285&r2=516286
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out Thu Mar 8 20:08:16 2007
@@ -422,7 +422,7 @@
1 row inserted/updated/deleted
ij> close c1;
ij> execute p1;
-ERROR XCL07: Cursor 'C1' is closed. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C1' not found. Verify that autocommit is OFF.
ij> -- clean up
autocommit on;
ij> drop table x;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java?view=diff&rev=516286&r1=516285&r2=516286
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java Thu Mar 8 20:08:16 2007
@@ -174,14 +174,14 @@
if (usingEmbedded())
assertStatementError("24000", delete);
else
- assertStatementError("XCL07", delete);
+ assertStatementError("42X30", delete);
// TEST: delete off a closed cursor
// Once this is closed then the cursor no longer exists.
cursor.close();
if (usingEmbedded())
- assertStatementError("XCL07", delete);
+ assertStatementError("42X30", delete);
else
assertStatementError("XCL16", delete);
@@ -282,7 +282,7 @@
// TEST: update off a closed cursor
cursor.close();
select.close();
- assertStatementError("XCL07", update);
+ assertStatementError("42X30", update);
update.close();
// TEST: no cursor with that name exists
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?view=diff&rev=516286&r1=516285&r2=516286
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Thu Mar 8 20:08:16 2007
@@ -524,7 +524,7 @@
fail("FAIL - deleteRow should have failed, positioned " +
"after last row");
} catch (SQLException e) {
- String sqlState = usingEmbedded() ? "24000" : "XCL07";
+ String sqlState = usingEmbedded() ? "24000" : "42X30";
assertSQLState(sqlState, e);
}
@@ -1858,14 +1858,14 @@
// this delete row will fire the delete trigger which will delete all
// the rows from the table and from the resultset
rs.deleteRow();
- try {
- assertFalse("FAIL - row not found", rs.next());
+ assertFalse("FAIL - row not found", rs.next());
+ try {
rs.deleteRow();
fail("FAIL - there should have be no more rows in the resultset " +
"at this point because delete trigger deleted all the " +
"rows");
} catch (SQLException e) {
- String sqlState = usingEmbedded() ? "24000" : "XCL07";
+ String sqlState = usingEmbedded() ? "24000" : "42X30";
assertSQLState(sqlState, e);
}
rs.close();
@@ -1942,13 +1942,13 @@
// this delete row will cause the delete cascade constraint to delete
// all the rows from the table and from the resultset
rs.deleteRow();
- try {
- assertFalse("FAIL - row not found", rs.next());
+ assertFalse("FAIL - row not found", rs.next());
+ try {
rs.deleteRow();
fail("FAIL - there should have be no more rows in the resultset " +
"at this point because of the delete cascade");
} catch (SQLException e) {
- String sqlState = usingEmbedded() ? "24000" : "XCL07";
+ String sqlState = usingEmbedded() ? "24000" : "42X30";
assertSQLState(sqlState, e);
}
rs.close();