From af54726926d1f0413ac0a00c6499245e70454258 Mon Sep 17 00:00:00 2001
From: mrniko <1104661+mrniko@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:20:45 +0300
Subject: [PATCH] tests fixed

---
 .../java/org/redisson/RedisDockerTest.java     |  5 ++++-
 .../java/org/redisson/jcache/JCacheTest.java   | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/redisson/src/test/java/org/redisson/RedisDockerTest.java b/redisson/src/test/java/org/redisson/RedisDockerTest.java
index 525db392e..d5eb1dc10 100644
--- a/redisson/src/test/java/org/redisson/RedisDockerTest.java
+++ b/redisson/src/test/java/org/redisson/RedisDockerTest.java
@@ -17,7 +17,9 @@ import org.redisson.config.Config;
 import org.redisson.config.Protocol;
 import org.redisson.connection.SequentialDnsAddressResolverFactory;
 import org.redisson.misc.RedisURI;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.*;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
@@ -52,7 +54,8 @@ public class RedisDockerTest {
                     args.addAll(Arrays.asList(params));
                     cmd.withCmd(args);
                 })
-                .withExposedPorts(6379);
+                .withExposedPorts(6379)
+                .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("redis")));
     }
 
     protected static GenericContainer<?> createRedis(String... params) {
diff --git a/redisson/src/test/java/org/redisson/jcache/JCacheTest.java b/redisson/src/test/java/org/redisson/jcache/JCacheTest.java
index 69f09f665..90378ddae 100644
--- a/redisson/src/test/java/org/redisson/jcache/JCacheTest.java
+++ b/redisson/src/test/java/org/redisson/jcache/JCacheTest.java
@@ -2,7 +2,9 @@ package org.redisson.jcache;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.redisson.RedisDockerTest;
 import org.redisson.api.CacheAsync;
@@ -37,11 +39,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class JCacheTest extends RedisDockerTest {
 
-//    @BeforeEach
-//    public void beforeEach() throws IOException, InterruptedException {
-//        org.testcontainers.containers.Container.ExecResult r = REDIS.execInContainer("redis-cli", "flushall");
-//        assertThat(r.getExitCode()).isEqualTo(0);
-//    }
+    @BeforeAll
+    public static void before() throws IOException, InterruptedException {
+        org.testcontainers.containers.Container.ExecResult r = REDIS.execInContainer("redis-cli", "CONFIG", "SET", "notify-keyspace-events", "Ehx");
+        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() {
         return new MutableConfiguration<>();