Update integration tests

This commit is contained in:
Vedran Pavic
2019-01-10 16:19:38 +01:00
parent b3ee28b972
commit 72198e9e80
14 changed files with 28 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@SpringSessionRedisOperations @SpringSessionRedisOperations
private RedisTemplate<Object, Object> sessionRedisTemplate; private RedisTemplate<Object, Object> sessionRedisTemplate;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@LocalServerPort @LocalServerPort
private int port; private int port;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class ApplicationTests { public class ApplicationTests {
private static final String DOCKER_IMAGE = "redis:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Value("${local.server.port}") @Value("${local.server.port}")
private String port; private String port;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Autowired @Autowired
private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter; private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter;

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
@Bean @Bean
public GenericContainer redisContainer() { public GenericContainer redisContainer() {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -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:5.0.1"; private static final String DOCKER_IMAGE = "redis:5.0.3";
protected static class BaseConfig { protected static class BaseConfig {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2018 the original author or authors. * Copyright 2014-2019 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.
@@ -88,7 +88,7 @@ final class DatabaseContainers {
private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> { private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> {
MariaDb10Container() { MariaDb10Container() {
super("mariadb:10.3.11"); super("mariadb:10.3.12");
} }
@Override @Override