Added getContext to test base

Author: jruaux

gradle.properties

@@ -5,6 +5,6 @@ kordampBuildVersion=2.6.0
 
 awaitilityVersion=4.1.1
 junitVersion=5.7.2
-lettucemodVersion=1.7.3
+lettucemodVersion=1.8.0
 slf4jVersion=1.7.32
 testcontainersVersion=1.15.3

subprojects/testcontainers-redis-junit-jupiter/src/main/java/com/redis/testcontainers/junit/jupiter/AbstractTestcontainersRedisTestBase.java

@@ -35,6 +35,10 @@ public abstract class AbstractTestcontainersRedisTestBase {
 
 	protected abstract Collection<RedisServer> servers();
 
+	protected RedisTestContext getContext(RedisServer server) {
+		return contexts.get(server);
+	}
+
 	protected Collection<RedisServer> testServers() {
 		return servers();
 	}

subprojects/testcontainers-redis-junit-jupiter/src/main/java/com/redis/testcontainers/junit/jupiter/RedisTestContext.java

@@ -16,32 +16,28 @@
 public class RedisTestContext implements AutoCloseable {
 
 	private final RedisServer server;
-	private final AbstractRedisClient client;
+	private AbstractRedisClient client;
 	private StatefulRedisModulesConnection<String, String> connection;
 	private StatefulRedisPubSubConnection<String, String> pubSubConnection;
 
 	public RedisTestContext(RedisServer server) {
 		this.server = server;
-		this.client = client(server);
 	}
 
 	@Override
 	public String toString() {
 		return server.toString();
 	}
 
-	private AbstractRedisClient client(RedisServer server) {
-		if (server.isCluster()) {
-			return RedisModulesClusterClient.create(server.getRedisURI());
-		}
-		return RedisModulesClient.create(server.getRedisURI());
-	}
-
 	public RedisServer getServer() {
 		return server;
 	}
 
 	public AbstractRedisClient getClient() {
+		if (client == null) {
+			this.client = server.isCluster() ? RedisModulesClusterClient.create(server.getRedisURI())
+					: RedisModulesClient.create(server.getRedisURI());
+		}
 		return client;
 	}
 
@@ -60,17 +56,17 @@ public StatefulRedisPubSubConnection<String, String> getPubSubConnection() {
 	}
 
 	private StatefulRedisModulesConnection<String, String> connection() {
-		if (client instanceof RedisModulesClusterClient) {
-			return ((RedisModulesClusterClient) client).connect();
+		if (server.isCluster()) {
+			return ((RedisModulesClusterClient) getClient()).connect();
 		}
-		return ((RedisModulesClient) client).connect();
+		return ((RedisModulesClient) getClient()).connect();
 	}
 
 	private StatefulRedisPubSubConnection<String, String> pubSubConnection() {
-		if (client instanceof RedisModulesClusterClient) {
-			return ((RedisModulesClusterClient) client).connectPubSub();
+		if (server.isCluster()) {
+			return ((RedisModulesClusterClient) getClient()).connectPubSub();
 		}
-		return ((RedisModulesClient) client).connectPubSub();
+		return ((RedisModulesClient) getClient()).connectPubSub();
 	}
 
 	public RedisModulesCommands<String, String> sync() {
@@ -93,20 +89,22 @@ public void close() {
 		if (connection != null) {
 			connection.close();
 		}
-		client.shutdown();
-		client.getResources().shutdown();
+		if (client != null) {
+			client.shutdown();
+			client.getResources().shutdown();
+		}
 	}
 
 	public RedisClient getRedisClient() {
-		return (RedisClient) client;
+		return (RedisClient) getClient();
 	}
 
 	public RedisClusterClient getRedisClusterClient() {
-		return (RedisClusterClient) client;
+		return (RedisClusterClient) getClient();
 	}
 
 	public boolean isCluster() {
-		return client instanceof RedisClusterClient;
+		return server.isCluster();
 	}
 
 }

subprojects/testcontainers-redis-tests/bin/test/com/redis/testcontainers/test/RedisEnterpriseContainerTests.class

@@ -7,13 +7,13 @@
 import org.junit.jupiter.api.Test;
 
 import com.redis.lettucemod.RedisModulesClient;
-import com.redis.lettucemod.Utils;
+import com.redis.lettucemod.RedisModulesUtils;
 import com.redis.lettucemod.api.StatefulRedisModulesConnection;
-import com.redis.lettucemod.api.search.Field;
-import com.redis.lettucemod.api.search.SearchResults;
 import com.redis.lettucemod.cluster.RedisModulesClusterClient;
 import com.redis.lettucemod.cluster.api.StatefulRedisModulesClusterConnection;
 import com.redis.lettucemod.output.ExecutionResults;
+import com.redis.lettucemod.search.Field;
+import com.redis.lettucemod.search.SearchResults;
 import com.redis.testcontainers.RedisEnterpriseContainer;
 
 import io.lettuce.core.RedisClient;
@@ -97,7 +97,7 @@ void gears() {
 	}
 
 	private String load(String resourceName) {
-		return Utils.toString(getClass().getClassLoader().getResourceAsStream(resourceName));
+		return RedisModulesUtils.toString(getClass().getClassLoader().getResourceAsStream(resourceName));
 	}
 
 }