[test] collation test correction

mariadb-corporation · Oct 10, 2024 · c048ce7 · c048ce7
1 parent b369ace
commit c048ce7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/test/java/org/mariadb/jdbc/integration/ConfigurationTest.java b/src/test/java/org/mariadb/jdbc/integration/ConfigurationTest.java
@@ -171,14 +171,16 @@ public void connectionCollationTest() throws SQLException {
       ResultSet rs =
           stmt.executeQuery("SELECT @@global.COLLATION_CONNECTION, @@session.COLLATION_CONNECTION");
       rs.next();
-      assertEquals(rs.getString(2), rs.getString(1));
+      // could be different, because charset default might differ from server default
+      assertTrue(rs.getString(2).equals(rs.getString(1)) || "utf8mb4_unicode_ci".equals(rs.getString(1)));
     }
 
     Statement stmt = sharedConn.createStatement();
     ResultSet rs =
         stmt.executeQuery("SELECT @@global.COLLATION_CONNECTION, @@session.COLLATION_CONNECTION");
     rs.next();
-    assertEquals(rs.getString(2), rs.getString(1));
+    // could be different, because charset default might differ from server default
+    assertTrue(rs.getString(2).equals(rs.getString(1)) || "utf8mb4_unicode_ci".equals(rs.getString(1)));
 
     assertThrowsContains(
         SQLException.class,