[test] correcting test for maxscale error MXS-3929

Author: diego Dupin

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

@@ -102,16 +102,12 @@ void basicLogging() throws Exception {
  + "+--------------------------------------------------+------------------+\n"
  + "| 02 00 00 04 01 31 | .....1 |\n"
  + "+--------------------------------------------------+------------------+\n";
- if ("maxscale".equals(System.getenv("srv")) || "skysql-ha".equals(System.getenv("srv"))) {
  Assertions.assertTrue(
- contents.contains(rowResultWithEof)
- || contents.contains(rowResultWithEof.replace("\r\n", "\n")),
+ contents.contains(rowResult)
+ || contents.contains(rowResult.replace("\r\n", "\n"))
+ || contents.contains(rowResultWithEof)
+ || contents.contains(rowResultWithEof.replace("\r\n", "\n")),
  contents);
- } else {
- Assertions.assertTrue(
- contents.contains(rowResult) || contents.contains(rowResult.replace("\r\n", "\n")),
- contents);
- }
 
  Assertions.assertTrue(
  contents.contains("pool MariaDB-pool new physical connection ")

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

@@ -652,6 +652,10 @@ public void moreResults() throws SQLException {
  }
 
  private void moreResults(Connection con) throws SQLException {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  Assumptions.assumeTrue(isMariaDBServer());
  Statement stmt = con.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS multi");
@@ -713,6 +717,10 @@ public void moreRowLimitedResults() throws SQLException {
  }
 
  private void moreRowLimitedResults(Connection con) throws SQLException {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  Statement stmt = con.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS multi");
  stmt.setFetchSize(3);

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

@@ -10,6 +10,7 @@
 import java.sql.*;
 import java.util.BitSet;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mariadb.jdbc.Statement;
@@ -35,6 +36,10 @@ public static void drop() throws SQLException {
 
  @Test
  public void callUseParameterName() throws Exception {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  CallableStatement stmt = sharedConn.prepareCall("{call useParameterName(?)}");
  stmt.setInt("a", 1);
  ResultSet rs = stmt.executeQuery();
@@ -45,6 +50,10 @@ public void callUseParameterName() throws Exception {
 
  @Test
  public void callWithStrangeParameter() throws SQLException {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  try (CallableStatement call = sharedConn.prepareCall("{call withStrangeParameter(?)}")) {
  double expected = 5.43;
  call.setDouble("a", expected);
@@ -65,6 +74,10 @@ public void callWithStrangeParameter() throws SQLException {
 
  @Test
  public void basicProcedure() throws SQLException {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  Statement stmt = sharedConn.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS basic_proc");
  stmt.execute(

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

@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mariadb.jdbc.MariaDbBlob;
@@ -97,6 +98,10 @@ public void prep() throws SQLException {
  @Test
  @SuppressWarnings("deprecated")
  public void basicProcedure() throws Throwable {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  Statement stmt = sharedConn.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS basic_proc");
  stmt.execute(
@@ -458,6 +463,10 @@ private void checkResults(CallableStatement callableStatement) throws SQLExcepti
 
  @Test
  public void setProcedureTest() throws Exception {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
+
  Statement stmt = sharedConn.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS basic_proc");
  stmt.execute(

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

@@ -721,6 +721,9 @@ public void fetchSize() throws SQLException {
 
  @Test
  public void moreResults() throws SQLException {
+ // error MXS-3929 for maxscale 6.2.0
+ Assumptions.assumeTrue(
+ !sharedConn.getMetaData().getDatabaseProductVersion().contains("maxScale-6.2.0"));
  Assumptions.assumeTrue(isMariaDBServer());
  Statement stmt = sharedConn.createStatement();
  stmt.execute("DROP PROCEDURE IF EXISTS multi");