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

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
   trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
Log:
Disable test on 5.1, as it's broken.

Modified:
branches/branch_5_0/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
===================================================================
---
branches/branch_5_0/connector-j/src/testsuite/regression/MetaDataRegressionTest.java	2006-12-14
20:17:11 UTC (rev 6167)
+++
branches/branch_5_0/connector-j/src/testsuite/regression/MetaDataRegressionTest.java	2006-12-14
21:18:31 UTC (rev 6168)
@@ -1667,7 +1667,17 @@
 	}
 	
 	public void testCharacterSetForDBMD() throws Exception {
-		String tableName = "\u00e9\u0074\u00e9";
+		if (versionMeetsMinimum(5, 1)) {
+			// server is broken, fixed in 5.2/6.0?
+			
+			if (!versionMeetsMinimum(5, 2)) {
+				return;
+			}
+		}
+		
+		String quoteChar = this.conn.getMetaData().getIdentifierQuoteString();
+		
+		String tableName = quoteChar + "\u00e9\u0074\u00e9" + quoteChar;
 		createTable(tableName, "(field1 int)");
 		this.rs = this.conn.getMetaData().getTables(this.conn.getCatalog(), 
 				null, tableName, new String[] {"TABLE"});

Modified: trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java	2006-12-14
20:17:11 UTC (rev 6167)
+++ trunk/connector-j/src/testsuite/regression/MetaDataRegressionTest.java	2006-12-14
21:18:31 UTC (rev 6168)
@@ -1540,35 +1540,6 @@
 		assertEquals(true, dbmd.supportsGroupByUnrelated());
 	}
 
-	private void testAbsenceOfMetadataForQuery(String query) throws Exception {
-		try {
-			this.pstmt = this.conn.prepareStatement(query);
-			ResultSetMetaData rsmd = this.pstmt.getMetaData();
-
-			assertNull(rsmd);
-
-			this.pstmt = ((com.mysql.jdbc.Connection) this.conn)
-					.clientPrepareStatement(query);
-			rsmd = this.pstmt.getMetaData();
-
-			assertNull(rsmd);
-		} finally {
-			if (this.pstmt != null) {
-				this.pstmt.close();
-			}
-		}
-	}
-
-	public void testRSMDToStringFromDBMD() throws Exception {
-		try {		
-			this.rs = this.conn.getMetaData().getTypeInfo();
-			
-			this.rs.getMetaData().toString(); // used to cause NPE
-		} finally {
-			closeMemberJDBCResources();
-		}
-	}
-
 	/**
 	 * Tests fix for BUG#21544 - When using information_schema for metadata, 
 	 * COLUMN_SIZE for getColumns() is not clamped to range of 
@@ -1665,6 +1636,56 @@
 		}
 	}
 
+
+	private void testAbsenceOfMetadataForQuery(String query) throws Exception {
+		try {
+			this.pstmt = this.conn.prepareStatement(query);
+			ResultSetMetaData rsmd = this.pstmt.getMetaData();
+
+			assertNull(rsmd);
+
+			this.pstmt = ((com.mysql.jdbc.Connection) this.conn)
+					.clientPrepareStatement(query);
+			rsmd = this.pstmt.getMetaData();
+
+			assertNull(rsmd);
+		} finally {
+			if (this.pstmt != null) {
+				this.pstmt.close();
+			}
+		}
+	}
+
+	public void testRSMDToStringFromDBMD() throws Exception {
+		try {		
+			this.rs = this.conn.getMetaData().getTypeInfo();
+			
+			this.rs.getMetaData().toString(); // used to cause NPE
+		} finally {
+			closeMemberJDBCResources();
+		}
+	}
+	
+	public void testCharacterSetForDBMD() throws Exception {
+		if (versionMeetsMinimum(5, 1)) {
+			// server is broken, fixed in 5.2/6.0?
+			
+			if (!versionMeetsMinimum(5, 2)) {
+				return;
+			}
+		}
+		
+		String quoteChar = this.conn.getMetaData().getIdentifierQuoteString();
+		
+		String tableName = quoteChar + "\u00e9\u0074\u00e9" + quoteChar;
+		createTable(tableName, "(field1 int)");
+		this.rs = this.conn.getMetaData().getTables(this.conn.getCatalog(), 
+				null, tableName, new String[] {"TABLE"});
+		assertEquals(true, this.rs.next());
+		System.out.println(this.rs.getString("TABLE_NAME"));
+		System.out.println(new String(this.rs.getBytes("TABLE_NAME"), "UTF-8"));
+	}
+
 	/**
 	 * Tests fix for BUG#18258 - Nonexistent catalog/database causes SQLException
 	 * to be raised, rather than returning empty result set.