Update integration tests

- upgrade TestContainers to 1.7.1
- update Docker images
- improve MariaDB/MySQL tests to use UTF-8

Closes gh-1034
This commit is contained in:
Vedran Pavic
2018-04-19 22:40:04 +02:00
parent 91b4efc5bd
commit 6c2f6c26cc
24 changed files with 407 additions and 191 deletions

View File

@@ -16,8 +16,6 @@
package sample;
import java.io.IOException;
import org.testcontainers.containers.GenericContainer;
import org.springframework.context.annotation.Bean;
@@ -30,23 +28,11 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
public class EmbeddedRedisConfig {
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.8";
private static final String REDIS_DOCKER_IMAGE = "redis:4.0.9";
@Bean(initMethod = "start")
public GenericContainer redisContainer() {
return new GenericContainer(REDIS_DOCKER_IMAGE) {
@Override
public void close() {
super.close();
try {
this.dockerClient.close();
}
catch (IOException ignored) {
}
}
}.withExposedPorts(6379);
return new GenericContainer(REDIS_DOCKER_IMAGE).withExposedPorts(6379);
}
@Bean