[misc] test stability improvement

Author: rusher

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

@@ -233,6 +233,17 @@ public static Connection createCon(String option, Integer sslPort) throws SQLExc
  return Driver.connect(conf);
  }
 
+ public static Connection createBasicCon(String option, Integer sslPort) throws SQLException {
+ Configuration conf =
+ Configuration.parse(mDefUrl.substring(0, mDefUrl.indexOf("?")) + "?" + option);
+ if (sslPort != null) {
+ for (HostAddress hostAddress : conf.addresses()) {
+ hostAddress.port = sslPort;
+ }
+ }
+ return Driver.connect(conf);
+ }
+
  @AfterEach
  public void afterEach1() throws SQLException {
  sharedConn.isValid(2000);

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

@@ -84,9 +84,13 @@ private static void createSslUser(String user, String requirement) throws SQLExc
 
  private String getSslVersion(Connection con) throws SQLException {
  Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("show STATUS LIKE 'Ssl_version'");
- if (rs.next()) {
- return rs.getString(2);
+ if ("maxscale".equals(System.getenv("srv")) || "skysql-ha".equals(System.getenv("srv"))) {
+ return "ok";
+ } else {
+ ResultSet rs = stmt.executeQuery("show STATUS LIKE 'Ssl_version'");
+ if (rs.next()) {
+ return rs.getString(2);
+ }
  }
  return null;
  }
@@ -163,6 +167,29 @@ public void enabledSslCipherSuites() throws SQLException {
  "Unsupported SSL cipher");
  }
 
+ @Test
+ public void errorUsingWrongTypeOfKeystore() throws Exception {
+ Assumptions.assumeTrue(
+ !"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
+ String pkcsFile = System.getenv("TEST_DB_CLIENT_PKCS");
+ Assumptions.assumeTrue(pkcsFile != null);
+
+ if (checkFileExists(pkcsFile) != null) {
+ // wrong keystore type
+ assertThrows(
+ SQLNonTransientConnectionException.class,
+ () ->
+ createCon(
+ baseMutualOptions
+ + "&sslMode=verify-ca&serverSslCert="
+ + pkcsFile
+ + "&trustStoreType=JKS&keyStore="
+ + System.getenv("TEST_DB_CLIENT_PKCS")
+ + "&keyStorePassword=kspass",
+ sslPort));
+ }
+ }
+
  @Test
  public void mutualAuthSsl() throws Exception {
  Assumptions.assumeTrue(
@@ -189,21 +216,6 @@ public void mutualAuthSsl() throws Exception {
  assertNotNull(getSslVersion(con));
  }
 
- String pkcsFile = System.getenv("TEST_DB_CLIENT_PKCS");
- if (pkcsFile != null && checkFileExists(pkcsFile) != null) {
- // wrong keystore type
- assertThrows(
- SQLNonTransientConnectionException.class,
- () ->
- createCon(
- baseMutualOptions
- + "&sslMode=verify-ca&serverSslCert="
- + pkcsFile
- + "&trustStoreType=JKS&keyStore="
- + System.getenv("TEST_DB_CLIENT_PKCS")
- + "&keyStorePassword=kspass",
- sslPort));
- }
  // with URL
  boolean isWin = System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win");
  try (Connection con =
@@ -323,15 +335,17 @@ public void certificateMandatorySsl() throws Throwable {
  createCon(baseOptions + "&sslMode=VERIFY_CA&serverSslCert=" + certificateString, sslPort)) {
  assertNotNull(getSslVersion(con));
  }
-
- assertThrows(
+ assertThrowsContains(
  SQLNonTransientConnectionException.class,
- () -> createCon(baseOptions + "&sslMode=VERIFY_CA", sslPort));
- assertThrows(
- SQLInvalidAuthorizationSpecException.class,
- () ->
- createCon(
- baseMutualOptions + "&sslMode=VERIFY_CA&serverSslCert=" + serverCertPath, sslPort));
+ () -> createBasicCon(baseOptions + "&sslMode=VERIFY_CA", sslPort),
+ "unable to find valid certification");
+ if (!"maxscale".equals(System.getenv("srv"))) {
+ assertThrows(
+ SQLInvalidAuthorizationSpecException.class,
+ () ->
+ createBasicCon(
+ baseMutualOptions + "&sslMode=VERIFY_CA&serverSslCert=" + serverCertPath, sslPort));
+ }
  }
 
  private String getServerCertificate(String serverCertPath) throws SQLException {

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

@@ -191,7 +191,7 @@ public void testAutoIncrement() throws Exception {
  rs.updateString(2, "0-1");
  rs.insertRow();
  }
-
+ stmt.execute("FLUSH TABLES");
  ResultSet rs = stmt.executeQuery("SELECT * FROM testAutoIncrement");
  assertTrue(rs.next());
  assertEquals(1, rs.getInt(1));
@@ -419,7 +419,7 @@ public void testPrimaryGenerated() throws Exception {
 
  assertFalse(rs.next());
  }
-
+ stmt.execute("FLUSH TABLES");
  ResultSet rs = stmt.executeQuery("SELECT id, t1, t2 FROM PrimaryGenerated");
  assertTrue(rs.next());
  assertEquals(1, rs.getInt(1));
@@ -497,7 +497,7 @@ public void testPrimaryGeneratedDefault() throws Exception {
  assertNotNull(rs.getDate(3));
  assertFalse(rs.next());
  }
-
+ stmt.execute("FLUSH TABLES");
  ResultSet rs = stmt.executeQuery("SELECT id, t1, t2 FROM testPrimaryGeneratedDefault");
  assertTrue(rs.next());
  assertEquals(1, rs.getInt(1));