From 22e3b5ce38777fd028c78411e727772d07198eda Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Mon, 22 Jan 2018 08:17:52 +0100 Subject: [PATCH] Update integration tests This commit updates TestContainers dependency and versions of Docker images used in integration tests. --- gradle/dependency-management.gradle | 7 ++----- .../MariaDB10JdbcOperationsSessionRepositoryITests.java | 2 +- .../jdbc/MySQL5JdbcOperationsSessionRepositoryITests.java | 2 +- .../SQLServerJdbcOperationsSessionRepositoryITests.java | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index b570e5e5..4fca5682 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -14,16 +14,13 @@ dependencyManagement { } dependencySet(group: 'org.testcontainers', version: '1.5.1') { + entry 'mariadb' + entry 'mssqlserver' entry 'mysql' entry 'postgresql' entry 'testcontainers' } - dependencySet(group: 'org.testcontainers', version: '1.4.3') { - entry 'mariadb' - entry 'mssqlserver' - } - dependency 'com.h2database:h2:1.4.196' dependency 'com.microsoft.sqlserver:mssql-jdbc:6.2.2.jre8' dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' 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 2fd0f420..47c5f7aa 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 @@ -46,7 +46,7 @@ import org.springframework.test.context.web.WebAppConfiguration; public class MariaDB10JdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests { - private static final String DOCKER_IMAGE = "mariadb:10.2.11"; + private static final String DOCKER_IMAGE = "mariadb:10.2.12"; @ClassRule public static MariaDBContainer mariaDBContainer = new MariaDBContainer(DOCKER_IMAGE); 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 569a22f5..4837438f 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 @@ -43,7 +43,7 @@ import org.springframework.test.context.web.WebAppConfiguration; public class MySQL5JdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests { - private static final String DOCKER_IMAGE = "mysql:5.7.20"; + private static final String DOCKER_IMAGE = "mysql:5.7.21"; @ClassRule public static MySQLContainer mySQLContainer = new MySQLContainer(DOCKER_IMAGE); 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 acec0c46..031edbee 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 @@ -20,7 +20,6 @@ import javax.sql.DataSource; import com.microsoft.sqlserver.jdbc.SQLServerDataSource; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.runner.RunWith; import org.testcontainers.containers.MSSQLServerContainer; @@ -39,14 +38,13 @@ import org.springframework.test.context.web.WebAppConfiguration; * * @author Vedran Pavic */ -@Ignore @RunWith(SpringRunner.class) @WebAppConfiguration @ContextConfiguration public class SQLServerJdbcOperationsSessionRepositoryITests extends AbstractJdbcOperationsSessionRepositoryITests { - private static final String DOCKER_IMAGE = "microsoft/mssql-server-linux:2017-CU2"; + private static final String DOCKER_IMAGE = "microsoft/mssql-server-linux:2017-CU3"; @ClassRule public static MSSQLServerContainer container = new MSSQLServerContainer(DOCKER_IMAGE);