TLS defaults updated and fix for tests failing with old MySQL servers.

Author: fjssilva

src/testsuite/regression/ConnectionRegressionTest.java

@@ -1718,7 +1718,7 @@ public void testBug23626() throws Exception {
      *             if the test fails.
      */
     public void testBug25545() throws Exception {
-        if (!versionMeetsMinimum(5, 0)) {
+        if (!versionMeetsMinimum(5, 0) || (!versionMeetsMinimum(5, 5) && !Util.jvmMeetsMinimum(8, 0))) {
             return;
         }
 
@@ -1758,6 +1758,9 @@ public void testBug25545() throws Exception {
      *             if the test fails.
      */
     public void testBug36948() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
         Connection _conn = null;
 
         try {
@@ -7538,7 +7541,7 @@ private void testBug71084AssertCase(Properties connProps, String clientTZ, Strin
      *             if the test fails.
      */
     public void testBug20685022() throws Exception {
-        if (!isCommunityEdition()) {
+        if (!isCommunityEdition() || !versionMeetsMinimum(5, 5)) {
             return;
         }
 
@@ -8340,6 +8343,10 @@ public SQLException interceptException(SQLException sqlEx, com.mysql.jdbc.Connec
      *             if the test fails.
      */
     public void testBug21947042() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
+
         Connection sslConn = null;
         Properties props = new Properties();
         props.setProperty("logger", BufferingLogger.class.getName());
@@ -8535,6 +8542,9 @@ public ResultSetInternalMethods preProcess(String sql, com.mysql.jdbc.Statement
      * Test certificates from testsuite/ssl-test-certs must be installed on both servers.
      */
     public void testTLSVersion() throws Exception {
+        if (!versionMeetsMinimum(5, 5) && !Util.jvmMeetsMinimum(8, 0)) {
+            return;
+        }
         // Find out which TLS protocol versions are supported by this JVM.
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(null, null, null);
@@ -8582,6 +8592,9 @@ public void testTLSVersion() throws Exception {
                 System.out.println("Highest common TLS protocol: " + highestCommonTlsVersion);
 
                 assertEquals(highestCommonTlsVersion, tlsVersionUsed);
+            } else if (((MySQLConnection) sslConn).versionMeetsMinimum(5, 6, 46)) {
+                assertEquals(jvmSupportedProtocols.contains("TLSv1.2") ? "TLSv1.2" : jvmSupportedProtocols.contains("TLSv1.1") ? "TLSv1.1" : "TLSv1",
+                        tlsVersionUsed);
             } else {
                 assertEquals("TLSv1", tlsVersionUsed);
             }
@@ -8602,6 +8615,9 @@ public void testTLSVersion() throws Exception {
      * Test certificates from testsuite/ssl-test-certs must be installed on both servers.
      */
     public void testEnableTLSVersion() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
         // Find out which TLS protocol versions are supported by this JVM.
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(null, null, null);
@@ -8637,6 +8653,11 @@ public void testEnableTLSVersion() throws Exception {
                 System.out.println("Server supports TLS protocols: " + serverSupportedProtocols);
                 commonSupportedProtocols.addAll(serverSupportedProtocols);
                 commonSupportedProtocols.retainAll(jvmSupportedProtocols);
+            } else if (((MySQLConnection) sslConn).versionMeetsMinimum(5, 6, 46) && !((MySQLConnection) sslConn).versionMeetsMinimum(5, 7, 0)) {
+                commonSupportedProtocols.add("TLSv1");
+                commonSupportedProtocols.add("TLSv1.1");
+                commonSupportedProtocols.add("TLSv1.2");
+                commonSupportedProtocols.retainAll(jvmSupportedProtocols);
             } else {
                 commonSupportedProtocols.add("TLSv1");
             }
@@ -10153,6 +10174,10 @@ public void testBug70785() throws Exception {
      * packets flow faster and desynchronization occurs rarely, which is the root cause for this problem.
      */
     public void testBug88242() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
+
         Properties props = new Properties();
         props.setProperty("useSSL", "true");
         props.setProperty("verifyServerCertificate", "false");

src/testsuite/regression/StatementRegressionTest.java

@@ -7838,6 +7838,10 @@ public ResultSet call() throws Exception {
      * Tests fix for Bug#23201930 - CLIENT HANG WHEN RSLT CUNCURRENCY=CONCUR_UPDATABLE AND RSLTSET TYPE=FORWARD_ONLY.
      */
     public void testBug23201930() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
+
         boolean useSSL = false;
         boolean useSPS = false;
         boolean useCursor = false;

src/testsuite/regression/SyntaxRegressionTest.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
 
   The MySQL Connector/J is licensed under the terms of the GPLv2
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
@@ -1511,11 +1511,10 @@ public void testGisFunctions() throws Exception {
         args.put("mpl", geoMultiPolygon);
         args.put("gc", geoGeometryCollection);
         args.put("gh", "'s14f5h28wc04jsq093jd'");
-        args.put("js",
-                "'{\"type\": \"GeometryCollection\", \"geometries\": [" + //
-                        "{\"type\": \"Point\", \"coordinates\": [8, 0]}, " + //
-                        "{\"type\": \"LineString\", \"coordinates\": [[0, 0], [8, 0], [4, 6], [0, 0]]}, " + //
-                        "{\"type\": \"Polygon\", \"coordinates\": [[[0, 3], [8, 3], [4, 9], [0, 3]]]}]}'");
+        args.put("js", "'{\"type\": \"GeometryCollection\", \"geometries\": [" + //
+                "{\"type\": \"Point\", \"coordinates\": [8, 0]}, " + //
+                "{\"type\": \"LineString\", \"coordinates\": [[0, 0], [8, 0], [4, 6], [0, 0]]}, " + //
+                "{\"type\": \"Polygon\", \"coordinates\": [[[0, 3], [8, 3], [4, 9], [0, 3]]]}]}'");
 
         final class GisFunction {
             String function;
@@ -2025,7 +2024,7 @@ public void testInnodbTablespaceEncryption() throws Exception {
         } else { // Syntax can still be tested by with different outcome.
             System.out.println("Although not required it is recommended that the 'keyring_file' plugin is properly installed and configured to run this test.");
 
-            String err = versionMeetsMinimum(8, 0, 4)
+            String err = versionMeetsMinimum(8, 0, 4) || versionMeetsMinimum(5, 7, 22) && !versionMeetsMinimum(8, 0, 0)
                     ? "Can't find master key from keyring, please check in the server log if a keyring plugin is loaded and initialized successfully."
                     : "Can't find master key from keyring, please check keyring plugin is loaded.";
 

src/testsuite/regression/jdbc4/ConnectionRegressionTest.java

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 
   The MySQL Connector/J is licensed under the terms of the GPLv2
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
@@ -134,7 +134,7 @@ public void testBug75168() throws Exception {
      *             if the test fails.
      */
     public void testBug20685022() throws Exception {
-        if (!isCommunityEdition()) {
+        if (!isCommunityEdition() || !versionMeetsMinimum(5, 5)) {
             return;
         }
 

src/testsuite/simple/ConnectionTest.java

@@ -1597,6 +1597,10 @@ private void checkInterfaceImplemented(Method[] interfaceMethods, Class<?> imple
     }
 
     public void testNonVerifyServerCert() throws Exception {
+        if (!versionMeetsMinimum(5, 5)) {
+            return;
+        }
+
         Properties props = new Properties();
         props.setProperty("useSSL", "true");
         props.setProperty("verifyServerCertificate", "false");