Skip to content

Commit 4434a29

Browse files
committed
[misc] code style correction
1 parent 31b36c1 commit 4434a29

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import static org.junit.jupiter.api.Assertions.*;
88

99
import java.sql.*;
10-
1110
import org.junit.jupiter.api.*;
1211

1312
public class ConfigurationTest extends Common {
@@ -59,7 +58,8 @@ public void testSessionVariable() throws SQLException {
5958
assertTrue(rs.next());
6059
} catch (SQLException e) {
6160
// in case server check variable validity
62-
Assertions.assertTrue(e.getCause().getMessage().contains("Unknown system variable 'some';f'"));
61+
Assertions.assertTrue(
62+
e.getCause().getMessage().contains("Unknown system variable 'some';f'"));
6363
}
6464
try (Connection connection =
6565
createCon("sessionVariables=session_track_system_variables=\"some\\\";f,'ff'\"")) {
@@ -68,10 +68,11 @@ public void testSessionVariable() throws SQLException {
6868
assertTrue(rs.next());
6969
} catch (SQLException e) {
7070
// in case server check variable validity
71-
Assertions.assertTrue(e.getCause().getMessage().contains("Unknown system variable 'some\";f'"));
71+
Assertions.assertTrue(
72+
e.getCause().getMessage().contains("Unknown system variable 'some\";f'"));
7273
}
7374
try (Connection connection =
74-
createCon("sessionVariables=session_track_system_variables=connect_timeout")) {
75+
createCon("sessionVariables=session_track_system_variables=connect_timeout")) {
7576
Statement stmt = connection.createStatement();
7677
ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
7778
assertTrue(rs.next());

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ private void testClosedConn(Connection con) throws SQLException {
237237
@Test
238238
public void masterFailover() throws Exception {
239239
Assumptions.assumeTrue(
240-
!"skysql".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
240+
!"maxscale".equals(System.getenv("srv"))
241+
&& !"skysql".equals(System.getenv("srv"))
242+
&& !"skysql-ha".equals(System.getenv("srv")));
241243

242244
Configuration conf = Configuration.parse(mDefUrl);
243245
HostAddress hostAddress = conf.addresses().get(0);

0 commit comments

Comments
 (0)