test: Added Redis Enterprise tests

Author: Julien Ruaux

lombok.config

@@ -31,10 +31,7 @@
 		<spring-batch-redis.version>2.30.3</spring-batch-redis.version>
 		<spring-batch.version>4.3.6</spring-batch.version>
 		<slf4j.version>1.7.36</slf4j.version>
-		<testcontainers-redis.version>1.4.6</testcontainers-redis.version>
-		<testcontainers.version>1.15.3</testcontainers.version>
-		<component-owner>redis</component-owner>
-		<component-name>redis-enterprise-kafka</component-name>
+		<testcontainers-redis.version>1.6.0</testcontainers-redis.version>
 	</properties>
 	<licenses>
 		<license>
@@ -125,7 +122,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.redis.testcontainers</groupId>
-			<artifactId>testcontainers-redis-junit-jupiter</artifactId>
+			<artifactId>testcontainers-redis-junit</artifactId>
 			<version>${testcontainers-redis.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -360,8 +357,8 @@
 						<linkcss>true</linkcss>
 						<github-owner>${github.owner}</github-owner>
 						<github-repo>${github.repo}</github-repo>
-						<component-owner>${component-owner}</component-owner>
-						<component-name>${component-name}</component-name>
+						<component-owner>redis</component-owner>
+						<component-name>redis-enterprise-kafka</component-name>
 						<project-artifact>${project.artifactId}</project-artifact>
 						<project-name>${project.name}</project-name>
 						<project-version>${project.version}</project-version>

pom.xml

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.springframework.util.Assert;
+import org.springframework.util.unit.DataSize;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
@@ -36,15 +37,18 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.jcustenborder.kafka.connect.utils.SinkRecordHelper;
+import com.redis.enterprise.Database;
+import com.redis.enterprise.RedisModule;
 import com.redis.kafka.connect.sink.RedisEnterpriseSinkConfig;
 import com.redis.kafka.connect.sink.RedisEnterpriseSinkTask;
 import com.redis.lettucemod.timeseries.Sample;
 import com.redis.lettucemod.timeseries.TimeRange;
+import com.redis.testcontainers.RedisEnterpriseContainer;
 import com.redis.testcontainers.RedisModulesContainer;
 import com.redis.testcontainers.RedisServer;
-import com.redis.testcontainers.junit.jupiter.AbstractTestcontainersRedisTestBase;
-import com.redis.testcontainers.junit.jupiter.RedisTestContext;
-import com.redis.testcontainers.junit.jupiter.RedisTestContextsSource;
+import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase;
+import com.redis.testcontainers.junit.RedisTestContext;
+import com.redis.testcontainers.junit.RedisTestContextsSource;
 
 import io.lettuce.core.KeyValue;
 import io.lettuce.core.Range;
@@ -57,9 +61,15 @@ class RedisEnterpriseSinkTaskIT extends AbstractTestcontainersRedisTestBase {
 	private static final RedisModulesContainer REDIS = new RedisModulesContainer(
 			RedisModulesContainer.DEFAULT_IMAGE_NAME.withTag(RedisModulesContainer.DEFAULT_TAG));
 
+	@Container
+	private static final RedisEnterpriseContainer REDIS_ENTERPRISE = new RedisEnterpriseContainer(
+			RedisEnterpriseContainer.DEFAULT_IMAGE_NAME.withTag(RedisEnterpriseContainer.DEFAULT_TAG))
+			.withDatabase(Database.name("RedisEnterpriseKafkaTests").memory(DataSize.ofMegabytes(100)).ossCluster(true)
+					.modules(RedisModule.SEARCH, RedisModule.JSON, RedisModule.TIMESERIES).build());
+
 	@Override
-	protected Collection<RedisServer> servers() {
-		return Arrays.asList(REDIS);
+	protected Collection<RedisServer> redisServers() {
+		return Arrays.asList(REDIS, REDIS_ENTERPRISE);
 	}
 
 	protected Map<String, String> map(String... args) {

src/test/integration/java/com/redis/kafka/connect/RedisEnterpriseSinkTaskIT.java

@@ -26,9 +26,9 @@
 import com.redis.spring.batch.reader.LiveRedisItemReader;
 import com.redis.testcontainers.RedisContainer;
 import com.redis.testcontainers.RedisServer;
-import com.redis.testcontainers.junit.jupiter.AbstractTestcontainersRedisTestBase;
-import com.redis.testcontainers.junit.jupiter.RedisTestContext;
-import com.redis.testcontainers.junit.jupiter.RedisTestContextsSource;
+import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase;
+import com.redis.testcontainers.junit.RedisTestContext;
+import com.redis.testcontainers.junit.RedisTestContextsSource;
 
 class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
 
@@ -39,7 +39,7 @@ class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
 			RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)).withKeyspaceNotifications();
 
 	@Override
-	protected Collection<RedisServer> servers() {
+	protected Collection<RedisServer> redisServers() {
 		return Arrays.asList(REDIS);
 	}