[misc] testing correction when testSingleHost is false

(cherry picked from commit 7db9cbb)

Author: rusher

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

@@ -376,9 +376,12 @@ public static void createFunction(String name, String body) throws SQLException
  * @throws SQLException if any error occur
  */
  public boolean anonymousUser() throws SQLException {
- Statement stmt = sharedConnection.createStatement();
- ResultSet rs = stmt.executeQuery("SELECT * FROM mysql.user u where u.Host='localhost' and u.User=''");
- return rs.next();
+ if (testSingleHost) {
+ Statement stmt = sharedConnection.createStatement();
+ ResultSet rs = stmt.executeQuery("SELECT * FROM mysql.user u where u.Host='localhost' and u.User=''");
+ return rs.next();
+ }
+ return false;
  }
 
  /**
@@ -388,8 +391,11 @@ public boolean anonymousUser() throws SQLException {
  * @throws SQLException exception
  */
  static boolean isMariadbServer() throws SQLException {
- DatabaseMetaData md = sharedConnection.getMetaData();
- return md.getDatabaseProductVersion().contains("MariaDB");
+ if (testSingleHost) {
+ DatabaseMetaData md = sharedConnection.getMetaData();
+ return md.getDatabaseProductVersion().contains("MariaDB");
+ }
+ return false;
  }
 
  /**

src/test/java/org/mariadb/jdbc/failover/AllowMasterDownTest.java

@@ -53,6 +53,7 @@
 package org.mariadb.jdbc.failover;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.mariadb.jdbc.BaseTest;
@@ -72,11 +73,14 @@ public class AllowMasterDownTest extends BaseTest {
  */
  @Before
  public void init() {
- masterDownUrl = "jdbc:mariadb:replication//" + hostname + ":9999"
- + "," + hostname + ((port == 0) ? "" : ":" + port)
- + "/" + database + "?user=" + username
- + ((password != null) ? "&password=" + password : "")
- + "&retriesAllDown=10&allowMasterDownConnection";
+ Assume.assumeTrue(testSingleHost);
+ if (testSingleHost) {
+ masterDownUrl = "jdbc:mariadb:replication//" + hostname + ":9999"
+ + "," + hostname + ((port == 0) ? "" : ":" + port)
+ + "/" + database + "?user=" + username
+ + ((password != null) ? "&password=" + password : "")
+ + "&retriesAllDown=10&allowMasterDownConnection";
+ }
  }
 
  @Test