Connector/J commit: r4940 - in branches: branch_5_0/connector-j/src/testsuite/simple branch_5_1/connector-j/src/testsuite/simple

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/testsuite/simple/StatementsTest.java
   branches/branch_5_1/connector-j/src/testsuite/simple/StatementsTest.java
Log:
Testsuite fixups for cursor-based fetch and cancel() functionality.

Modified: branches/branch_5_0/connector-j/src/testsuite/simple/StatementsTest.java
===================================================================
--- branches/branch_5_0/connector-j/src/testsuite/simple/StatementsTest.java	2006-02-16 01:01:35 UTC (rev 4939)
+++ branches/branch_5_0/connector-j/src/testsuite/simple/StatementsTest.java	2006-02-16 21:21:23 UTC (rev 4940)
@@ -546,6 +546,7 @@
 
 			// Make sure we can still use the connection...
 
+			cancelStmt.setQueryTimeout(0);
 			this.rs = cancelStmt.executeQuery("SELECT 1");
 
 			assertTrue(this.rs.next());
@@ -1121,28 +1122,43 @@
 
 			this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (1)");
 
-			PreparedStatement fetchStmt = this.conn
-					.prepareStatement("SELECT field1 FROM testRowFetch WHERE field1=1");
-			fetchStmt.setFetchSize(10);
-			this.rs = fetchStmt.executeQuery();
-			assertTrue(this.rs.next());
+			Connection fetchConn = null;
+			
+			Properties props = new Properties();
+			props.setProperty("useCursorFetch", "true");
+			
+			
+			try {
+				fetchConn = getConnectionWithProps(props);
+				
+				PreparedStatement fetchStmt = fetchConn
+						.prepareStatement("SELECT field1 FROM testRowFetch WHERE field1=1");
+				fetchStmt.setFetchSize(10);
+				this.rs = fetchStmt.executeQuery();
+				assertTrue(this.rs.next());
+	
+				this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (2), (3)");
+	
+				fetchStmt = fetchConn
+						.prepareStatement("SELECT field1 FROM testRowFetch ORDER BY field1");
+				fetchStmt.setFetchSize(1);
+				this.rs = fetchStmt.executeQuery();
+	
+				assertTrue(this.rs.next());
+				assertEquals(1, this.rs.getInt(1));
+				assertTrue(this.rs.next());
+				assertEquals(2, this.rs.getInt(1));
+				assertTrue(this.rs.next());
+				assertEquals(3, this.rs.getInt(1));
+				assertEquals(false, this.rs.next());
+	
+				fetchStmt.executeQuery();
+			} finally {
+				if (fetchConn != null) {
+					fetchConn.close();
+				}
+			}
 
-			this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (2), (3)");
-
-			fetchStmt = this.conn
-					.prepareStatement("SELECT field1 FROM testRowFetch ORDER BY field1");
-			fetchStmt.setFetchSize(1);
-			this.rs = fetchStmt.executeQuery();
-
-			assertTrue(this.rs.next());
-			assertEquals(1, this.rs.getInt(1));
-			assertTrue(this.rs.next());
-			assertEquals(2, this.rs.getInt(1));
-			// assertTrue(this.rs.next());
-			// assertEquals(3, this.rs.getInt(1));
-
-			fetchStmt.executeQuery();
-
 		}
 	}
 

Modified: branches/branch_5_1/connector-j/src/testsuite/simple/StatementsTest.java
===================================================================
--- branches/branch_5_1/connector-j/src/testsuite/simple/StatementsTest.java	2006-02-16 01:01:35 UTC (rev 4939)
+++ branches/branch_5_1/connector-j/src/testsuite/simple/StatementsTest.java	2006-02-16 21:21:23 UTC (rev 4940)
@@ -549,7 +549,6 @@
 			// Make sure we can still use the connection...
 
 			cancelStmt.setQueryTimeout(0);
-			
 			this.rs = cancelStmt.executeQuery("SELECT 1");
 
 			assertTrue(this.rs.next());
@@ -1125,28 +1124,43 @@
 
 			this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (1)");
 
-			PreparedStatement fetchStmt = this.conn
-					.prepareStatement("SELECT field1 FROM testRowFetch WHERE field1=1");
-			fetchStmt.setFetchSize(10);
-			this.rs = fetchStmt.executeQuery();
-			assertTrue(this.rs.next());
+			Connection fetchConn = null;
+			
+			Properties props = new Properties();
+			props.setProperty("useCursorFetch", "true");
+			
+			
+			try {
+				fetchConn = getConnectionWithProps(props);
+				
+				PreparedStatement fetchStmt = fetchConn
+						.prepareStatement("SELECT field1 FROM testRowFetch WHERE field1=1");
+				fetchStmt.setFetchSize(10);
+				this.rs = fetchStmt.executeQuery();
+				assertTrue(this.rs.next());
+	
+				this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (2), (3)");
+	
+				fetchStmt = fetchConn
+						.prepareStatement("SELECT field1 FROM testRowFetch ORDER BY field1");
+				fetchStmt.setFetchSize(1);
+				this.rs = fetchStmt.executeQuery();
+	
+				assertTrue(this.rs.next());
+				assertEquals(1, this.rs.getInt(1));
+				assertTrue(this.rs.next());
+				assertEquals(2, this.rs.getInt(1));
+				assertTrue(this.rs.next());
+				assertEquals(3, this.rs.getInt(1));
+				assertEquals(false, this.rs.next());
+	
+				fetchStmt.executeQuery();
+			} finally {
+				if (fetchConn != null) {
+					fetchConn.close();
+				}
+			}
 
-			this.stmt.executeUpdate("INSERT INTO testRowFetch VALUES (2), (3)");
-
-			fetchStmt = this.conn
-					.prepareStatement("SELECT field1 FROM testRowFetch ORDER BY field1");
-			fetchStmt.setFetchSize(1);
-			this.rs = fetchStmt.executeQuery();
-
-			assertTrue(this.rs.next());
-			assertEquals(1, this.rs.getInt(1));
-			assertTrue(this.rs.next());
-			assertEquals(2, this.rs.getInt(1));
-			// assertTrue(this.rs.next());
-			// assertEquals(3, this.rs.getInt(1));
-
-			fetchStmt.executeQuery();
-
 		}
 	}