[misc] parsec SSL fingerprint test correction

mariadb-corporation · Nov 14, 2024 · 147a08a · 147a08a
1 parent da6a56c
commit 147a08a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/test/java/org/mariadb/jdbc/integration/Common.java b/src/test/java/org/mariadb/jdbc/integration/Common.java
@@ -289,6 +289,19 @@ public boolean isWindows() {
     return System.getProperty("os.name").toLowerCase().contains("win");
   }
 
+  public int getJavaVersion() {
+    String version = System.getProperty("java.version");
+    if (version.startsWith("1.")) {
+      version = version.substring(2, 3);
+    } else {
+      int dot = version.indexOf(".");
+      if (dot != -1) {
+        version = version.substring(0, dot);
+      }
+    }
+    return Integer.parseInt(version);
+  }
+
   public void cancelForVersion(int major, int minor) {
     String dbVersion = sharedConn.getMetaData().getDatabaseProductVersion();
     Assumptions.assumeFalse(dbVersion.startsWith(major + "." + minor));

diff --git a/src/test/java/org/mariadb/jdbc/integration/SslTest.java b/src/test/java/org/mariadb/jdbc/integration/SslTest.java
@@ -242,7 +242,7 @@ public void mandatoryEphemeralSsled25519() throws SQLException {
   @Test
   public void mandatoryEphemeralSslParsec() throws SQLException {
     Assumptions.assumeTrue(!"maxscale".equals(System.getenv("srv")));
-    Assumptions.assumeTrue(isMariaDBServer() && minVersion(11, 6, 1));
+    Assumptions.assumeTrue(isMariaDBServer() && minVersion(11, 6, 1) && getJavaVersion() >= 15);
 
     Statement stmt = sharedConn.createStatement();
     try {