From f4704293a1bf9f637f2927e38966213c0277db0e Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 8 Jun 2018 16:48:31 +0200 Subject: [PATCH] Update integration tests --- gradle/dependency-management.gradle | 6 +++--- ...ariaDb10JdbcOperationsSessionRepositoryITests.java | 2 +- .../MySql5JdbcOperationsSessionRepositoryITests.java | 6 ++++++ .../MySql8JdbcOperationsSessionRepositoryITests.java | 11 +++++++---- ...greSql10JdbcOperationsSessionRepositoryITests.java | 2 +- ...tgreSql9JdbcOperationsSessionRepositoryITests.java | 2 +- ...qlServerJdbcOperationsSessionRepositoryITests.java | 7 ++++++- 7 files changed, 25 insertions(+), 11 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index d423b894..7f8f5c65 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.0.6.RELEASE' mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR7' mavenBom 'org.springframework.security:spring-security-bom:5.0.5.RELEASE' - mavenBom 'org.testcontainers:testcontainers-bom:1.7.2' + mavenBom 'org.testcontainers:testcontainers-bom:1.7.3' } dependencies { @@ -23,8 +23,8 @@ dependencyManagement { dependency 'mysql:mysql-connector-java:8.0.11' dependency 'org.apache.derby:derby:10.14.2.0' dependency 'org.assertj:assertj-core:3.9.1' - dependency 'org.hsqldb:hsqldb:2.4.0' - dependency 'org.mariadb.jdbc:mariadb-java-client:2.2.3' + dependency 'org.hsqldb:hsqldb:2.4.1' + dependency 'org.mariadb.jdbc:mariadb-java-client:2.2.5' dependency 'org.mockito:mockito-core:2.18.3' dependency 'org.postgresql:postgresql:42.2.2' } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java index a072a60a..c308b60c 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class MariaDb10JdbcOperationsSessionRepositoryITests private static class MariaDb10Container extends MariaDBContainer { MariaDb10Container() { - super("mariadb:10.2.14"); + super("mariadb:10.3.7"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java index cd1c43b1..758e6b33 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql5JdbcOperationsSessionRepositoryITests.java @@ -18,6 +18,7 @@ package org.springframework.session.jdbc; import javax.sql.DataSource; +import com.mysql.cj.jdbc.Driver; import com.mysql.cj.jdbc.MysqlDataSource; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -94,6 +95,11 @@ public class MySql5JdbcOperationsSessionRepositoryITests "--collation-server=utf8mb4_unicode_ci"); } + @Override + public String getDriverClassName() { + return Driver.class.getName(); + } + } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java index 5b39480a..31ae0076 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MySql8JdbcOperationsSessionRepositoryITests.java @@ -18,10 +18,10 @@ package org.springframework.session.jdbc; import javax.sql.DataSource; +import com.mysql.cj.jdbc.Driver; import com.mysql.cj.jdbc.MysqlDataSource; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.runner.RunWith; import org.testcontainers.containers.MySQLContainer; @@ -39,7 +39,6 @@ import org.springframework.test.context.web.WebAppConfiguration; * * @author Vedran Pavic */ -@Ignore @RunWith(SpringRunner.class) @WebAppConfiguration @ContextConfiguration @@ -92,8 +91,12 @@ public class MySql8JdbcOperationsSessionRepositoryITests @Override protected void configure() { super.configure(); - setCommand("mysqld", "--character-set-server=utf8mb4", - "--collation-server=utf8mb4_unicode_ci"); + setCommand("mysqld", "--default-authentication-plugin=mysql_native_password"); + } + + @Override + public String getDriverClassName() { + return Driver.class.getName(); } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java index 301141a1..a93e1168 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql10JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class PostgreSql10JdbcOperationsSessionRepositoryITests extends PostgreSQLContainer { PostgreSql10Container() { - super("postgres:10.3"); + super("postgres:10.4"); } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java index 9281a2ec..41187e3a 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSql9JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class PostgreSql9JdbcOperationsSessionRepositoryITests extends PostgreSQLContainer { PostgreSql9Container() { - super("postgres:9.6.8"); + super("postgres:9.6.9"); } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java index 1fc5f83d..37a520b9 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java @@ -88,7 +88,12 @@ public class SqlServerJdbcOperationsSessionRepositoryITests extends MSSQLServerContainer { SqlServer2007Container() { - super("microsoft/mssql-server-linux:2017-CU6"); + super("microsoft/mssql-server-linux:2017-CU7"); + } + + @Override + protected int getStartupTimeoutSeconds() { + return 240; } }