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

[mmatthews]

Modified:
  
branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java
   branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
  
branches/branch_5_0/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java
   branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java
Log:
Fixups for JDK-1.3 support (Yes, Sun still supports it on Solaris ... for now).

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java	2007-05-10
00:53:29 UTC (rev 6420)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/CallableStatementRegressionTest.java	2007-05-10
20:16:08 UTC (rev 6421)
@@ -982,6 +982,10 @@
 		if (!serverSupportsStoredProcedures()) {
 			return; // no stored procs
 		}
+		
+		if (isRunningOnJdk131()) {
+			return; // no such method to test
+		}
 
 		createProcedure("spbug25715", "(INOUT mblob MEDIUMBLOB)" + "BEGIN"
 				+ " SELECT 1 FROM DUAL WHERE 1=0;" + "\nEND");

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-10
00:53:29 UTC (rev 6420)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-10
20:16:08 UTC (rev 6421)
@@ -1820,7 +1820,7 @@
 	 * @throws Exception if the test fails.
 	 */
 	public void testBug24706() throws Exception {
-		if (!versionMeetsMinimum(4, 1)) {
+		if (!versionMeetsMinimum(5, 0)) {
 			return; // server status isn't there to support this feature
 		}
 		
@@ -2051,7 +2051,7 @@
 			loggedConn.getTransactionIsolation();
 			
 			if (versionMeetsMinimum(4, 0, 3)) {
-				assertEquals(-1, logBuf.indexOf("SHOW VARIABLES LIKE 'tx_isolation'"));
+				assertEquals(-1, logBuf.toString().indexOf("SHOW VARIABLES LIKE 'tx_isolation'"));
 			}
 		} finally {
 			if (loggedConn != null) {
@@ -2076,12 +2076,14 @@
 		Connection failoverConn = null;
 		
 		
-		((com.mysql.jdbc.Connection)failoverConn).setPreferSlaveDuringFailover(true);
 		Statement failoverStmt = 
 			null;
 		
 		try {
 			failoverConn = getConnectionWithProps(getMasterSlaveUrl(), props);
+
+			((com.mysql.jdbc.Connection)failoverConn).setPreferSlaveDuringFailover(true);
+			
 			failoverStmt = failoverConn.createStatement();
 			
 			String masterConnectionId = getSingleIndexedValueWithQuery(failoverConn, 1, "SELECT
connection_id()").toString();

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java	2007-05-10
00:53:29 UTC (rev 6420)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java	2007-05-10
20:16:08 UTC (rev 6421)
@@ -286,7 +286,7 @@
 					/ numLoops;
 
 			checkTime("PreparedStatement.setDouble()", setDoubleAvgMs);
-
+			
 			start = System.currentTimeMillis();
 
 			Time tm = new Time(start);

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-10
00:53:29 UTC (rev 6420)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-10
20:16:08 UTC (rev 6421)
@@ -3943,6 +3943,11 @@
 	}
 	
 	public void testBustedGGKWithPSExecute() throws Exception {
+		if (isRunningOnJdk131()) {
+			// no such method
+			return;
+		}
+		
 		createTable("sequence", "(sequence_name VARCHAR(255) NOT NULL PRIMARY KEY, next_val
BIGINT NOT NULL)");
 		
 		// Populate with the initial value