From: mmatthews
Date: May 14 2007 7:33pm
Subject: Connector/J commit: r6427 - in branches: branch_3_1/connector-j/src/testsuite branch_3_1/connector-j/src/testsuite/regression branch_5_0/connector-j/src/testsuite/regression branch_5_1/connector-j/src/testsuite/regression
List-Archive: http://lists.mysql.com/commits/26639
Message-Id: <200705141933.l4EJXoTZ004528@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/branch_3_1/connector-j/src/testsuite/BaseTestCase.java
   branches/branch_3_1/connector-j/src/testsuite/regression/StatementRegressionTest.java
   branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java
   branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java
Log:
JDK-1.3.1 doesn't have DST patches, so don't try testBug3620() in that environment.

Modified: branches/branch_3_1/connector-j/src/testsuite/BaseTestCase.java
===================================================================
--- branches/branch_3_1/connector-j/src/testsuite/BaseTestCase.java	2007-05-14 19:08:11 UTC (rev 6426)
+++ branches/branch_3_1/connector-j/src/testsuite/BaseTestCase.java	2007-05-14 19:33:48 UTC (rev 6427)
@@ -37,6 +37,7 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 
 import junit.framework.TestCase;
@@ -506,7 +507,13 @@
 				major, minor, subminor));
 	}
 	
+	protected boolean isRunningOnJRockit() {
+		String vmVendor = System.getProperty("java.vm.vendor");
 
+		return (vmVendor != null && vmVendor.toUpperCase(Locale.US).startsWith(
+				"BEA"));
+	}
+	
 	protected boolean isRunningOnJdk131() {
 		return this.runningOnJdk131;
 	}

Modified: branches/branch_3_1/connector-j/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- branches/branch_3_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-14 19:08:11 UTC (rev 6426)
+++ branches/branch_3_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-14 19:33:48 UTC (rev 6427)
@@ -1251,7 +1251,17 @@
 	 *             if the test fails.
 	 */
 	public void testBug3620() throws SQLException {
+		if (isRunningOnJRockit()) {
+			// bug with their timezones
+			return;
+		}
 		
+		if (isRunningOnJdk131()) {
+			// bug with timezones, no update
+			// for new DST in USA
+			return;
+		}
+		
 		long epsillon = 3000; // 3 seconds time difference
 
 		try {

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-14 19:08:11 UTC (rev 6426)
+++ branches/branch_5_0/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-14 19:33:48 UTC (rev 6427)
@@ -1278,6 +1278,12 @@
 			return;
 		}
 		
+		if (isRunningOnJdk131()) {
+			// bug with timezones, no update
+			// for new DST in USA
+			return;
+		}
+		
 		long epsillon = 3000; // 3 seconds time difference
 
 		try {

Modified: branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java
===================================================================
--- branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-14 19:08:11 UTC (rev 6426)
+++ branches/branch_5_1/connector-j/src/testsuite/regression/StatementRegressionTest.java	2007-05-14 19:33:48 UTC (rev 6427)
@@ -1278,6 +1278,12 @@
 			return;
 		}
 		
+		if (isRunningOnJdk131()) {
+			// bug with timezones, no update
+			// for new DST in USA
+			return;
+		}
+		
 		long epsillon = 3000; // 3 seconds time difference
 
 		try {