Author: kmarsden
Date: Fri Sep 30 19:53:01 2005
New Revision: 292910
URL: http://svn.apache.org/viewcvs?rev=292910&view=rev
Log:
DERBY-593
Add jdk14 suite to network server tests
This patch adds jdk14 suite to derbynetmats. Ran derbyall with Sun jdk1.4.2. No failures. A summary of tests is below:
Total tests in jdk14 suite: 10
DerbyNetClient: 7 pass, 3 excluded
DerbyNet: 6 pass, 4 excluded
jdbcapi/autoGeneratedJdbc30.java - PASS - With no changes
jdbcapi/dbMetaDataJdbc30.java - PASS - With no changes
lang/holdCursorJava.java - PASS - Minor change to test for DerbyNetClient. EXCLUDE for DerbyNet.
jdbcapi/checkDataSource30.java - EXCLUDE - Need to look into failure
jdbcapi/parameterMetaDataJdbc30.java - PASS - With no changes
lang/procedureJdbc30.java - PASS - Added new master files
jdbcapi/resultsetJdbc30.java - EXCLUDE - None of the tested features are supported by both client drivers
jdbcapi/statementJdbc30.java - EXCLUDE - Need to look into failure
jdbcapi/savepointJdbc30.java - PASS - With no changes
store/bootLock.java - PASS - With no changes
Contributed by Deepa Remesh
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out (with props)
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClient.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out?rev=292910&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out Fri Sep 30 19:53:01 2005
@@ -0,0 +1,195 @@
+Fetching result sets with getMoreResults()
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.CLOSE_CURRENT_RESULT)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.CLOSE_ALL_RESULTS)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+Fetching result sets with getMoreResults()
+ first two with KEEP_CURRENT_RESULT
+ RS (1) val 2
+ RS (2) val 3
+ third with CLOSE_CURRENT_RESULT
+ RS (1) val 3
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ fourth with KEEP_CURRENT_RESULT
+ RS (1) val 4
+ Exception - Invalid operation: result set closed
+ RS (3) val 5
+ RS (4) val 5
+ fifth with CLOSE_ALL_RESULTS
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ no more results with with KEEP_CURRENT_RESULT
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 7
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that cs.execute() closes them
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ fetched all results
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+ executing statement
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that cs.close() closes them
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ fetched all results
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+ closing statement
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/procedureJdbc30.out
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out?rev=292910&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out Fri Sep 30 19:53:01 2005
@@ -0,0 +1,195 @@
+Fetching result sets with getMoreResults()
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.CLOSE_CURRENT_RESULT)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.CLOSE_ALL_RESULTS)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ Exception - Invalid operation: result set closed
+ RS (2) val 3
+ PASS 3 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ PASS 4 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (4) val 5
+ PASS 5 got result set true
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT)
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+Fetching result sets with getMoreResults()
+ first two with KEEP_CURRENT_RESULT
+ RS (1) val 2
+ RS (2) val 3
+ third with CLOSE_CURRENT_RESULT
+ RS (1) val 3
+ Exception - Invalid operation: result set closed
+ RS (3) val 4
+ fourth with KEEP_CURRENT_RESULT
+ RS (1) val 4
+ Exception - Invalid operation: result set closed
+ RS (3) val 5
+ RS (4) val 5
+ fifth with CLOSE_ALL_RESULTS
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 6
+ no more results with with KEEP_CURRENT_RESULT
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ RS (5) val 7
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that cs.execute() closes them
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ fetched all results
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+ executing statement
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that cs.close() closes them
+ PASS 1 got result set true
+ RS (1) val 2
+ PASS 2 got result set true
+ RS (1) val 3
+ RS (2) val 3
+ PASS 3 got result set true
+ RS (1) val 4
+ RS (2) val 4
+ RS (3) val 4
+ PASS 4 got result set true
+ RS (1) val 5
+ RS (2) val 5
+ RS (3) val 5
+ RS (4) val 5
+ PASS 5 got result set true
+ RS (1) val 6
+ RS (2) val 6
+ RS (3) val 6
+ RS (4) val 6
+ RS (5) val 6
+ fetched all results
+ RS (1) val 7
+ RS (2) val 7
+ RS (3) val 7
+ RS (4) val 7
+ RS (5) val 7
+ closing statement
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
+ Exception - Invalid operation: result set closed
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=292910&r1=292909&r2=292910&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude Fri Sep 30 19:53:01 2005
@@ -7,6 +7,10 @@
# excluding jdbcapi/SetQueryTimeoutTest.java because neither the JCC driver nor the ClientDriver support setQueryTimeout() yet.
# excluding lang/updatableResultSet.java because changes are required in JCC Driver for this test to run correctly
# excluding jdbcapi/rsgetXXXcolumnNames.java as it fails incorrectly, according to JDBC spec. Forwarding test case to JCC team.
+# excluding jdbcapi/resultsetJdbc30.java because the features tested are not implemented by JCC driver or ClientDriver
+# excluding jdbcapi/checkDataSource30.java - Client behaves differently. Need to look into this
+# excluding jdbcapi/statementJdbc30.java - Client behaves differently. Need to look into this
+# excluding jdbcapi/holdCursorJava.java - JCC behaves differently with hold cursors.
jdbcapi/resultsetStream.java
lang/errorStream.java
lang/scrollCursors2.java
@@ -17,3 +21,7 @@
jdbcapi/SetQueryTimeoutTest.java
lang/updatableResultSet.java
jdbcapi/blobSetBinaryStream.java
+jdbcapi/resultsetJdbc30.java
+jdbcapi/checkDataSource30.java
+jdbcapi/statementJdbc30.java
+lang/holdCursorJava.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClient.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClient.exclude?rev=292910&r1=292909&r2=292910&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClient.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClient.exclude Fri Sep 30 19:53:01 2005
@@ -5,6 +5,9 @@
# excluding statementJdbc20.java because this tests fetch_reverse throughout the test
# excluding jdbcapi/testRelative.java because it is a new test that requires debugging with the IBM Driver
# excluding jdbcapi/SetQueryTimeoutTest.java because neither the JCC driver nor the ClientDriver support setQueryTimeout() yet.
+# excluding jdbcapi/resultsetJdbc30.java because the features tested are not implemented by Derby Client
+# excluding jdbcapi/checkDataSource30.java - Client behaves differently. Need to look into this
+# excluding jdbcapi/statementJdbc30.java - Client behaves differently. Need to look into this
jdbcapi/resultsetStream.java
lang/errorStream.java
lang/scrollCursors2.java
@@ -12,3 +15,6 @@
jdbcapi/statementJdbc20.java
jdbcapi/testRelative.java
jdbcapi/SetQueryTimeoutTest.java
+jdbcapi/resultsetJdbc30.java
+jdbcapi/checkDataSource30.java
+jdbcapi/statementJdbc30.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties?rev=292910&r1=292909&r2=292910&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.properties Fri Sep 30 19:53:01 2005
@@ -1,5 +1,5 @@
framework=DerbyNet
-suites=derbynetmats jdbcapi jdbc20 multi
+suites=derbynetmats jdbcapi jdbc20 multi jdk14
jdk12test=true
runwithj9=false
timeout=60
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java?rev=292910&r1=292909&r2=292910&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorJava.java Fri Sep 30 19:53:01 2005
@@ -53,6 +53,7 @@
testHoldCursorOnMultiTableQuery(conn);
testIsolationLevelChange(conn);
+ conn.rollback();
conn.close();
} catch (Exception e) {
System.out.println("FAIL -- unexpected exception "+e);