Connector/J commit: r5909 - branches/branch_5_0/connector-j/src/testsuite/regression

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java
Log:
Exclude testing 1.4+ features on a 1.3.1 vm.

Modified: branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java
===================================================================
--- branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java	2006-10-19 15:47:48 UTC (rev 5908)
+++ branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java	2006-10-19 17:15:19 UTC (rev 5909)
@@ -476,8 +476,10 @@
 				cStmt.setInt(3, 1);
 				cStmt.setInt(4, 1);
 				
-				assertEquals(4, cStmt.getParameterMetaData().getParameterCount());
-				assertEquals(Types.OTHER, cStmt.getParameterMetaData().getParameterType(1));
+				if (!isRunningOnJdk131()) {
+					assertEquals(4, cStmt.getParameterMetaData().getParameterCount());
+					assertEquals(Types.OTHER, cStmt.getParameterMetaData().getParameterType(1));
+				}
 				
 				assertFalse(cStmt.execute());
 				assertEquals(2f, cStmt.getInt(1), .001);
@@ -489,20 +491,22 @@
 				assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
 						.getName());
 
-				cStmt.setFloat("a", 4);
-				cStmt.setInt("b", 1);
-				cStmt.setInt("c", 1);
+				if (!isRunningOnJdk131()) {
+					cStmt.setFloat("a", 4);
+					cStmt.setInt("b", 1);
+					cStmt.setInt("c", 1);
+					
+					assertFalse(cStmt.execute());
+					assertEquals(4f, cStmt.getInt(1), .001);
+					assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
+							.getName());
+					
+					assertEquals(-1, cStmt.executeUpdate());
+					assertEquals(4f, cStmt.getInt(1), .001);
+					assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
+							.getName());
+				}
 				
-				assertFalse(cStmt.execute());
-				assertEquals(4f, cStmt.getInt(1), .001);
-				assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
-						.getName());
-				
-				assertEquals(-1, cStmt.executeUpdate());
-				assertEquals(4f, cStmt.getInt(1), .001);
-				assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
-						.getName());
-				
 				// Check metadata while we're at it
 
 				java.sql.DatabaseMetaData dbmd = this.conn.getMetaData();
@@ -546,9 +550,11 @@
 				assertEquals("java.lang.Integer", cStmt.getObject(1).getClass()
 						.getName());
 				
-				assertEquals(2, cStmt.getParameterMetaData().getParameterCount());
-				assertEquals(Types.OTHER, cStmt.getParameterMetaData().getParameterType(1));
-				assertEquals(Types.INTEGER, cStmt.getParameterMetaData().getParameterType(2));
+				if (!isRunningOnJdk131()) {
+					assertEquals(2, cStmt.getParameterMetaData().getParameterCount());
+					assertEquals(Types.OTHER, cStmt.getParameterMetaData().getParameterType(1));
+					assertEquals(Types.INTEGER, cStmt.getParameterMetaData().getParameterType(2));
+				}
 			} finally {
 				if (this.rs != null) {
 					this.rs.close();