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

Update integration tests

Browse Source
This commit is contained in:
Vedran Pavic
2018-07-23 12:15:14 +02:00
parent 9adf0a6e0c
commit 7ac6e458e0
17 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/dependency-management.gradle
View File

@@ -5,7 +5,7 @@ dependencyManagement {
mavenBom 'org.springframework:spring-framework-bom:5.0.7.RELEASE' mavenBom 'org.springframework:spring-framework-bom:5.0.7.RELEASE'
mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR8' mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR8'
mavenBom 'org.springframework.security:spring-security-bom:5.0.6.RELEASE' mavenBom 'org.springframework.security:spring-security-bom:5.0.6.RELEASE'
mavenBom 'org.testcontainers:testcontainers-bom:1.7.3' mavenBom 'org.testcontainers:testcontainers-bom:1.8.1'
} }
dependencies { dependencies {

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

@@ -46,7 +46,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@SpringBootTest(webEnvironment = WebEnvironment.MOCK) @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
public class FindByUsernameTests { public class FindByUsernameTests {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

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

@@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@AutoConfigureMockMvc @AutoConfigureMockMvc
public class HttpRedisJsonTest { public class HttpRedisJsonTest {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

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

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest @SpringBootTest
public class RedisSerializerTest { public class RedisSerializerTest {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@SpringSessionRedisOperations @SpringSessionRedisOperations
private RedisTemplate<Object, Object> sessionRedisTemplate; private RedisTemplate<Object, Object> sessionRedisTemplate;

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

@@ -45,7 +45,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@SpringBootTest(webEnvironment = WebEnvironment.MOCK) @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
public class BootTests { public class BootTests {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

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

@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class AttributeTests { public class AttributeTests {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@LocalServerPort @LocalServerPort
private int port; private int port;

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

@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class ApplicationTests { public class ApplicationTests {
private static final String DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Value("${local.server.port}") @Value("${local.server.port}")
private String port; private String port;

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

@@ -28,7 +28,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 DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

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

@@ -28,7 +28,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 DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

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

@@ -54,7 +54,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.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Autowired @Autowired
private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter; private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter;

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

@@ -28,7 +28,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 DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

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

@@ -28,7 +28,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 DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

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

@@ -28,7 +28,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 DOCKER_IMAGE = "redis:4.0.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

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

@@ -29,7 +29,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.9"; private static final String DOCKER_IMAGE = "redis:4.0.10";
protected static class BaseConfig { protected static class BaseConfig {

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

@@ -86,7 +86,7 @@ public class MariaDb10JdbcOperationsSessionRepositoryITests
private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> { private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> {
MariaDb10Container() { MariaDb10Container() {
super("mariadb:10.3.7"); super("mariadb:10.3.8");
} }
@Override @Override

11
spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java
View File

@@ -21,7 +21,6 @@ import javax.sql.DataSource;
import com.microsoft.sqlserver.jdbc.SQLServerDataSource; import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.MSSQLServerContainer;
@@ -40,7 +39,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
@@ -88,12 +86,9 @@ public class SqlServerJdbcOperationsSessionRepositoryITests
extends MSSQLServerContainer<SqlServer2007Container> { extends MSSQLServerContainer<SqlServer2007Container> {
SqlServer2007Container() { SqlServer2007Container() {
super("microsoft/mssql-server-linux:2017-CU7"); super("microsoft/mssql-server-linux:2017-CU8");
} withStartupTimeoutSeconds(240);
withConnectTimeoutSeconds(240);
@Override
protected int getStartupTimeoutSeconds() {
return 240;
} }
} }

1
spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt Normal file
View File

@@ -0,0 +1 @@
microsoft/mssql-server-linux:2017-CU8