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 fu...@apache.org on 2006/03/08 01:01:01 UTC
svn commit: r384061 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/DerbyNetClient/updatableResultSet.out master/updatableResultSet.out
tests/lang/updatableResultSet.java
Author: fuzzylogic
Date: Tue Mar 7 16:00:56 2006
New Revision: 384061
URL: http://svn.apache.org/viewcvs?rev=384061&view=rev
Log:
DERBY-975: Catch exception but don't call getMessage on it in 1.3 VMs. Fixes a canon diff in
updatableResultSet.java on ibm131.
Committed for Fernanda Pizzorno <Fe...@sun.com>
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out?rev=384061&r1=384060&r2=384061&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out Tue Mar 7 16:00:56 2006
@@ -2959,11 +2959,9 @@
Positive test 41 - try to insertRow from all posible positions
Positive test 42 - InsertRow leaving a nullable columns = NULL
Positive and negative tests 43 - Commit while on insertRow
-This exception is expected with jdk 1.3
-null
+This exception is expected with jdk 1.3: holdability not supported with jdk131 /ibm131 based jvms
Positive test 43 - Commit while on insertRow with holdable cursor
-This exception is expected with jdk 1.3
-null
+This exception is expected with jdk 1.3: holdability not supported with jdk131 /ibm131 based jvms
Negative test 43 - Commit while on insertRow with not holdable cursor
Negative test 44 - Closed RS
Negative test 44.a - try insertRow on closed RS
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out?rev=384061&r1=384060&r2=384061&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatableResultSet.out Tue Mar 7 16:00:56 2006
@@ -2892,11 +2892,9 @@
Positive test 41 - try to insertRow from all posible positions
Positive test 42 - InsertRow leaving a nullable columns = NULL
Positive and negative tests 43 - Commit while on insertRow
-This exception is expected with jdk 1.3
-null
+This exception is expected with jdk 1.3: holdability not supported with jdk131 /ibm131 based jvms
Positive test 43 - Commit while on insertRow with holdable cursor
-This exception is expected with jdk 1.3
-null
+This exception is expected with jdk 1.3: holdability not supported with jdk131 /ibm131 based jvms
Negative test 43 - Commit while on insertRow with not holdable cursor
Negative test 44 - Closed RS
Negative test 44.a - try insertRow on closed RS
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java?rev=384061&r1=384060&r2=384061&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/updatableResultSet.java Tue Mar 7 16:00:56 2006
@@ -2618,8 +2618,13 @@
try {
conn.setHoldability(ResultSet.HOLD_CURSORS_OVER_COMMIT);
} catch (Throwable e) {
- System.out.println("This exception is expected with jdk 1.3\n" +
- e.getMessage());
+ if (JVMInfo.JDK_ID <= 2) {
+ System.out.println("This exception is expected with jdk 1.3: " +
+ "holdability not supported with jdk131 /ibm131 based jvms");
+
+ } else {
+ System.out.println("Got unexpected exception: " + e.getMessage());
+ }
}
stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
System.out.println("Positive test 43 - Commit while on insertRow " +
@@ -2640,8 +2645,12 @@
try {
conn.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
} catch (Throwable e) {
- System.out.println("This exception is expected with jdk 1.3\n" +
- e.getMessage());
+ if (JVMInfo.JDK_ID <= 2) {
+ System.out.println("This exception is expected with jdk 1.3: " +
+ "holdability not supported with jdk131 /ibm131 based jvms");
+ } else {
+ System.out.println("Got unexpected exception: " + e.getMessage());
+ }
}
stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
System.out.println("Negative test 43 - Commit while on insertRow " +