tests fixed

pull/4237/merge
mrniko 2 weeks ago
parent d47f010dc7
commit af54726926

@ -17,7 +17,9 @@ import org.redisson.config.Config;
import org.redisson.config.Protocol; import org.redisson.config.Protocol;
import org.redisson.connection.SequentialDnsAddressResolverFactory; import org.redisson.connection.SequentialDnsAddressResolverFactory;
import org.redisson.misc.RedisURI; import org.redisson.misc.RedisURI;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.*; import org.testcontainers.containers.*;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@ -52,7 +54,8 @@ public class RedisDockerTest {
args.addAll(Arrays.asList(params)); args.addAll(Arrays.asList(params));
cmd.withCmd(args); cmd.withCmd(args);
}) })
.withExposedPorts(6379); .withExposedPorts(6379)
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("redis")));
} }
protected static GenericContainer<?> createRedis(String... params) { protected static GenericContainer<?> createRedis(String... params) {

@ -2,7 +2,9 @@ package org.redisson.jcache;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.redisson.RedisDockerTest; import org.redisson.RedisDockerTest;
import org.redisson.api.CacheAsync; import org.redisson.api.CacheAsync;
@ -37,11 +39,17 @@ import static org.assertj.core.api.Assertions.assertThat;
public class JCacheTest extends RedisDockerTest { public class JCacheTest extends RedisDockerTest {
// @BeforeEach @BeforeAll
// public void beforeEach() throws IOException, InterruptedException { public static void before() throws IOException, InterruptedException {
// org.testcontainers.containers.Container.ExecResult r = REDIS.execInContainer("redis-cli", "flushall"); org.testcontainers.containers.Container.ExecResult r = REDIS.execInContainer("redis-cli", "CONFIG", "SET", "notify-keyspace-events", "Ehx");
// assertThat(r.getExitCode()).isEqualTo(0); assertThat(r.getExitCode()).isEqualTo(0);
// } }
@AfterAll
public static void after() throws IOException, InterruptedException {
org.testcontainers.containers.Container.ExecResult r = REDIS.execInContainer("redis-cli", "CONFIG", "SET", "notify-keyspace-events", "");
assertThat(r.getExitCode()).isEqualTo(0);
}
<K, V> MutableConfiguration<K, V> createJCacheConfig() { <K, V> MutableConfiguration<K, V> createJCacheConfig() {
return new MutableConfiguration<>(); return new MutableConfiguration<>();

Loading…
Cancel
Save