mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update integration tests

Browse Source 
This commit updates TestContainers dependency and versions of Docker images used in integration tests.
This commit is contained in:
Vedran Pavic
2018-02-12 19:07:59 +01:00
parent 003996a1b3
commit 17ee9d51f2
17 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/dependency-management.gradle
View File

@@ -13,7 +13,7 @@ dependencyManagement {
entry 'hazelcast-client' entry 'hazelcast-client'
} }
dependencySet(group: 'org.testcontainers', version: '1.5.1') { dependencySet(group: 'org.testcontainers', version: '1.6.0') {
entry 'mariadb' entry 'mariadb'
entry 'mssqlserver' entry 'mssqlserver'
entry 'mysql' entry 'mysql'

2
samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java
View File

@@ -49,7 +49,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@ContextConfiguration(initializers = FindByUsernameTests.Initializer.class) @ContextConfiguration(initializers = FindByUsernameTests.Initializer.class)
public class FindByUsernameTests { public class FindByUsernameTests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java
View File

@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = HttpRedisJsonTest.Initializer.class) @ContextConfiguration(initializers = HttpRedisJsonTest.Initializer.class)
public class HttpRedisJsonTest { public class HttpRedisJsonTest {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java
View File

@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = RedisSerializerTest.Initializer.class) @ContextConfiguration(initializers = RedisSerializerTest.Initializer.class)
public class RedisSerializerTest { public class RedisSerializerTest {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/boot/redis/src/integration-test/java/sample/BootTests.java
View File

@@ -48,7 +48,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@ContextConfiguration(initializers = BootTests.Initializer.class) @ContextConfiguration(initializers = BootTests.Initializer.class)
public class BootTests { public class BootTests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java
View File

@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = AttributeTests.Initializer.class) @ContextConfiguration(initializers = AttributeTests.Initializer.class)
public class AttributeTests { public class AttributeTests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/boot/websocket/src/test/java/sample/ApplicationTests.java
View File

@@ -55,7 +55,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
@ContextConfiguration(initializers = ApplicationTests.Initializer.class) @ContextConfiguration(initializers = ApplicationTests.Initializer.class)
public class ApplicationTests { public class ApplicationTests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis") @Profile("embedded-redis")
public class EmbeddedRedisConfig { public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.7"; private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
@Bean(initMethod = "start") @Bean(initMethod = "start")
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

2
samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis") @Profile("embedded-redis")
public class EmbeddedRedisConfig { public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.7"; private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
@Bean(initMethod = "start") @Bean(initMethod = "start")
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

2
samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java
View File

@@ -55,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@WebAppConfiguration @WebAppConfiguration
public class RestMockMvcTests { public class RestMockMvcTests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

2
samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis") @Profile("embedded-redis")
public class EmbeddedRedisConfig { public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.7"; private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
@Bean(initMethod = "start") @Bean(initMethod = "start")
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

2
samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis") @Profile("embedded-redis")
public class EmbeddedRedisConfig { public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.7"; private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
@Bean(initMethod = "start") @Bean(initMethod = "start")
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

2
samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis") @Profile("embedded-redis")
public class EmbeddedRedisConfig { public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.7"; private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
@Bean(initMethod = "start") @Bean(initMethod = "start")
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

2
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
*/ */
public abstract class AbstractRedisITests { public abstract class AbstractRedisITests {
private static final String DOCKER_IMAGE = "redis:4.0.7"; private static final String DOCKER_IMAGE = "redis:4.0.8";
@ClassRule @ClassRule
public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE) public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSQL10JdbcOperationsSessionRepositoryITests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2017 the original author or authors. * Copyright 2014-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
public class PostgreSQL10JdbcOperationsSessionRepositoryITests public class PostgreSQL10JdbcOperationsSessionRepositoryITests
extends AbstractJdbcOperationsSessionRepositoryITests { extends AbstractJdbcOperationsSessionRepositoryITests {
private static final String DOCKER_IMAGE = "postgres:10.1"; private static final String DOCKER_IMAGE = "postgres:10.2";
@ClassRule @ClassRule
public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer( public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(

4
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/PostgreSQL9JdbcOperationsSessionRepositoryITests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2017 the original author or authors. * Copyright 2014-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
public class PostgreSQL9JdbcOperationsSessionRepositoryITests public class PostgreSQL9JdbcOperationsSessionRepositoryITests
extends AbstractJdbcOperationsSessionRepositoryITests { extends AbstractJdbcOperationsSessionRepositoryITests {
private static final String DOCKER_IMAGE = "postgres:9.6.6"; private static final String DOCKER_IMAGE = "postgres:9.6.7";
@ClassRule @ClassRule
public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer( public static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(

2
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SQLServerJdbcOperationsSessionRepositoryITests.java
View File

@@ -20,7 +20,6 @@ import javax.sql.DataSource;
import com.microsoft.sqlserver.jdbc.SQLServerDataSource; import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.MSSQLServerContainer;
@@ -39,7 +38,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
* *
* @author Vedran Pavic * @author Vedran Pavic
*/ */
@Ignore
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@WebAppConfiguration @WebAppConfiguration
@ContextConfiguration @ContextConfiguration