[misc] mysql 8 testing correction

Author: rusher

.travis.yml

@@ -29,7 +29,7 @@ install:
  connector-test-machine/launch.bat -t "$srv" -v "$v" -d testj
  ;;
  linux)
- source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testj -n 0 -l "$LOCAL"
+ source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testj -n 0 -l "$local"
  ;;
  esac
 jobs:
@@ -42,11 +42,11 @@ jobs:
  - env: srv=mariadb v=10.5
  os: windows
  language: shell
- - env: srv=mariadb v=10.2 LOCAL=1
- - env: srv=mariadb v=10.3 LOCAL=1
- - env: srv=mariadb v=10.4 LOCAL=1
- - env: srv=mariadb v=10.5 LOCAL=1
- - env: srv=mariadb v=10.5 LOCAL=1 BENCH=1
+ - env: srv=mariadb v=10.2 local=1
+ - env: srv=mariadb v=10.3 local=1
+ - env: srv=mariadb v=10.4 local=1
+ - env: srv=mariadb v=10.5
+ - env: srv=mariadb v=10.5 local=1 BENCH=1
  - env: srv=maxscale
  - env: srv=skysql
  - env: srv=skysql-ha

src/test/java/org/mariadb/jdbc/Common.java

@@ -30,11 +30,10 @@
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Optional;
 import java.util.Properties;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.AfterEachCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.*;
 import org.junit.jupiter.api.function.Executable;
 import org.mariadb.jdbc.integration.tools.TcpProxy;
 import org.mariadb.jdbc.util.constants.HaMode;
@@ -141,8 +140,6 @@ public void cancelForVersion(int major, int minor) {
  Assumptions.assumeFalse(dbVersion.startsWith(major + "." + minor));
  }
 
- // @RegisterExtension public Extension watcher = new Follow();
-
  public static Connection createCon(String option) throws SQLException {
  return (Connection) DriverManager.getConnection(mDefUrl + "&" + option);
  }
@@ -176,16 +173,38 @@ public void assertThrowsContains(
  Assertions.assertTrue(e.getMessage().contains(expected), "real message:" + e.getMessage());
  }
 
- private class Follow implements BeforeEachCallback, AfterEachCallback {
+ @RegisterExtension public Extension watcher = new Follow();
+
+ private class Follow implements TestWatcher, BeforeEachCallback {
  @Override
- public void afterEach(ExtensionContext extensionContext) throws Exception {
- System.out.println(Duration.between(initialTest, Instant.now()).toString());
+ public void testDisabled(ExtensionContext context, Optional<String> reason) {
+ System.out.println(
+ String.format(
+ " - Disabled %s: with reason :- %s",
+ context.getDisplayName(), reason.orElse("No reason")));
+ }
+
+ @Override
+ public void testAborted(ExtensionContext context, Throwable cause) {
+ System.out.println(String.format(" - Aborted %s: ", context.getDisplayName()));
+ }
+
+ @Override
+ public void testFailed(ExtensionContext context, Throwable cause) {
+ System.out.println(String.format(" \u2717 Failed %s: ", context.getDisplayName()));
+ }
+
+ @Override
+ public void testSuccessful(ExtensionContext context) {
+ System.out.println(
+ String.format(
+ " ✓ %s: %sms",
+ context.getDisplayName(), Duration.between(initialTest, Instant.now()).toMillis()));
  }
 
  @Override
  public void beforeEach(ExtensionContext extensionContext) throws Exception {
  initialTest = Instant.now();
- System.out.print(" test : " + extensionContext.getTestMethod().get() + " ");
  }
  }
 }

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -874,18 +874,16 @@ public void windowsNamedPipe() throws SQLException {
 
  @Test
  public void localSocket() throws Exception {
- Assumptions.assumeTrue(System.getenv("LOCAL") != null);
+ System.out.println("local:" + System.getenv("local"));
+ Assumptions.assumeTrue(System.getenv("local") != null
+ && "1".equals(System.getenv("local"))
+ && !System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win"));
  Statement stmt = sharedConn.createStatement();
  ResultSet rs = stmt.executeQuery("select @@version_compile_os,@@socket");
  if (!rs.next()) {
  return;
  }
  System.out.println("os:" + rs.getString(1) + " path:" + rs.getString(2));
- String os = rs.getString(1);
- if (os.toLowerCase().startsWith("win")) {
- return;
- }
-
  String path = rs.getString(2);
  stmt.execute("DROP USER IF EXISTS testSocket@'localhost'");
  stmt.execute("CREATE USER testSocket@'localhost' IDENTIFIED BY 'MySup5%rPassw@ord'");

src/test/java/org/mariadb/jdbc/integration/Sha256AuthenticationTest.java

@@ -31,16 +31,15 @@ public static void init() throws Exception {
  if (rsaPublicKey == null
  && rs.getString(1) != null
  && System.getenv("TEST_DB_RSA_PUBLIC_KEY") != null) {
- rsaPublicKey =
- checkFileExists(System.getenv("TEST_DB_RSA_PUBLIC_KEY") + "/" + rs.getString(1));
+ rsaPublicKey = checkFileExists(System.getenv("TEST_DB_RSA_PUBLIC_KEY"));
  }
  }
  if (rsaPublicKey == null) {
  rsaPublicKey = checkFileExists("../../ssl/public.key");
  }
 
  stmt.execute(
- "CREATE USER 'cachingSha256User'@'%' IDENTIFIED WITH caching_sha2_password BY 'password'");
+ "CREATE USER 'cachingSha256User'@'%' IDENTIFIED WITH caching_sha2_password BY 'MySup8%rPassw@ord'");
  stmt.execute("GRANT ALL PRIVILEGES ON *.* TO 'cachingSha256User'@'%'");
  stmt.execute(
  "CREATE USER 'cachingSha256User2'@'%' IDENTIFIED WITH caching_sha2_password BY ''");
@@ -80,7 +79,7 @@ public void cachingSha256Empty() throws Exception {
  Assumptions.assumeTrue(
  !isWindows && !isMariaDBServer() && rsaPublicKey != null && minVersion(8, 0, 0));
  sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
- try (Connection con = createCon("user=cachingSha256User2")) {
+ try (Connection con = createCon("user=cachingSha256User2&allowPublicKeyRetrieval")) {
  con.isValid(1);
  }
  }
@@ -92,7 +91,8 @@ public void cachingSha256PluginTestWithServerRsaKey() throws Exception {
  sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
  try (Connection con =
  createCon(
- "user=cachingSha256User&password=password&serverRsaPublicKeyFile=" + rsaPublicKey)) {
+ "user=cachingSha256User&password=MySup8%rPassw@ord&serverRsaPublicKeyFile="
+ + rsaPublicKey)) {
  con.isValid(1);
  }
  }
@@ -102,7 +102,7 @@ public void cachingSha256PluginTestWithoutServerRsaKey() throws Exception {
  Assumptions.assumeTrue(!isWindows && minVersion(8, 0, 0));
  sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
  try (Connection con =
- createCon("user=cachingSha256User&password=password&allowPublicKeyRetrieval")) {
+ createCon("user=cachingSha256User&password=MySup8%rPassw@ord&allowPublicKeyRetrieval")) {
  con.isValid(1);
  }
  }
@@ -114,7 +114,7 @@ public void cachingSha256PluginTestException() throws Exception {
 
  assertThrowsContains(
  SQLException.class,
- () -> createCon("user=cachingSha256User&password=password"),
+ () -> createCon("user=cachingSha256User&password=MySup8%rPassw@ord"),
  "RSA public key is not available client side");
  }
 
@@ -124,7 +124,7 @@ public void cachingSha256PluginTestSsl() throws Exception {
  sharedConn.createStatement().execute("FLUSH PRIVILEGES"); // reset cache
 
  Assumptions.assumeTrue(haveSsl());
- try (Connection con = createCon("user=cachingSha256User&password=password&sslMode=trust")) {
+ try (Connection con = createCon("user=cachingSha256User&password=MySup8%rPassw@ord&sslMode=trust")) {
  con.isValid(1);
  }
  }