Skip to content

Commit dc9a739

Browse files
author
Julien Ruaux
committed
test: Added Redis Enterprise tests
1 parent 5b63b92 commit dc9a739

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

lombok.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@
3131
<spring-batch-redis.version>2.30.3</spring-batch-redis.version>
3232
<spring-batch.version>4.3.6</spring-batch.version>
3333
<slf4j.version>1.7.36</slf4j.version>
34-
<testcontainers-redis.version>1.4.6</testcontainers-redis.version>
35-
<testcontainers.version>1.15.3</testcontainers.version>
36-
<component-owner>redis</component-owner>
37-
<component-name>redis-enterprise-kafka</component-name>
34+
<testcontainers-redis.version>1.6.0</testcontainers-redis.version>
3835
</properties>
3936
<licenses>
4037
<license>
@@ -125,7 +122,7 @@
125122
</dependency>
126123
<dependency>
127124
<groupId>com.redis.testcontainers</groupId>
128-
<artifactId>testcontainers-redis-junit-jupiter</artifactId>
125+
<artifactId>testcontainers-redis-junit</artifactId>
129126
<version>${testcontainers-redis.version}</version>
130127
<scope>test</scope>
131128
</dependency>
@@ -360,8 +357,8 @@
360357
<linkcss>true</linkcss>
361358
<github-owner>${github.owner}</github-owner>
362359
<github-repo>${github.repo}</github-repo>
363-
<component-owner>${component-owner}</component-owner>
364-
<component-name>${component-name}</component-name>
360+
<component-owner>redis</component-owner>
361+
<component-name>redis-enterprise-kafka</component-name>
365362
<project-artifact>${project.artifactId}</project-artifact>
366363
<project-name>${project.name}</project-name>
367364
<project-version>${project.version}</project-version>

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.params.ParameterizedTest;
3030
import org.springframework.util.Assert;
31+
import org.springframework.util.unit.DataSize;
3132
import org.testcontainers.junit.jupiter.Container;
3233
import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
3334
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
@@ -36,15 +37,18 @@
3637
import com.fasterxml.jackson.core.JsonProcessingException;
3738
import com.fasterxml.jackson.databind.ObjectMapper;
3839
import com.github.jcustenborder.kafka.connect.utils.SinkRecordHelper;
40+
import com.redis.enterprise.Database;
41+
import com.redis.enterprise.RedisModule;
3942
import com.redis.kafka.connect.sink.RedisEnterpriseSinkConfig;
4043
import com.redis.kafka.connect.sink.RedisEnterpriseSinkTask;
4144
import com.redis.lettucemod.timeseries.Sample;
4245
import com.redis.lettucemod.timeseries.TimeRange;
46+
import com.redis.testcontainers.RedisEnterpriseContainer;
4347
import com.redis.testcontainers.RedisModulesContainer;
4448
import com.redis.testcontainers.RedisServer;
45-
import com.redis.testcontainers.junit.jupiter.AbstractTestcontainersRedisTestBase;
46-
import com.redis.testcontainers.junit.jupiter.RedisTestContext;
47-
import com.redis.testcontainers.junit.jupiter.RedisTestContextsSource;
49+
import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase;
50+
import com.redis.testcontainers.junit.RedisTestContext;
51+
import com.redis.testcontainers.junit.RedisTestContextsSource;
4852

4953
import io.lettuce.core.KeyValue;
5054
import io.lettuce.core.Range;
@@ -57,9 +61,15 @@ class RedisEnterpriseSinkTaskIT extends AbstractTestcontainersRedisTestBase {
5761
private static final RedisModulesContainer REDIS = new RedisModulesContainer(
5862
RedisModulesContainer.DEFAULT_IMAGE_NAME.withTag(RedisModulesContainer.DEFAULT_TAG));
5963

64+
@Container
65+
private static final RedisEnterpriseContainer REDIS_ENTERPRISE = new RedisEnterpriseContainer(
66+
RedisEnterpriseContainer.DEFAULT_IMAGE_NAME.withTag(RedisEnterpriseContainer.DEFAULT_TAG))
67+
.withDatabase(Database.name("RedisEnterpriseKafkaTests").memory(DataSize.ofMegabytes(100)).ossCluster(true)
68+
.modules(RedisModule.SEARCH, RedisModule.JSON, RedisModule.TIMESERIES).build());
69+
6070
@Override
61-
protected Collection<RedisServer> servers() {
62-
return Arrays.asList(REDIS);
71+
protected Collection<RedisServer> redisServers() {
72+
return Arrays.asList(REDIS, REDIS_ENTERPRISE);
6373
}
6474

6575
protected Map<String, String> map(String... args) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.redis.spring.batch.reader.LiveRedisItemReader;
2727
import com.redis.testcontainers.RedisContainer;
2828
import com.redis.testcontainers.RedisServer;
29-
import com.redis.testcontainers.junit.jupiter.AbstractTestcontainersRedisTestBase;
30-
import com.redis.testcontainers.junit.jupiter.RedisTestContext;
31-
import com.redis.testcontainers.junit.jupiter.RedisTestContextsSource;
29+
import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase;
30+
import com.redis.testcontainers.junit.RedisTestContext;
31+
import com.redis.testcontainers.junit.RedisTestContextsSource;
3232

3333
class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
3434

@@ -39,7 +39,7 @@ class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
3939
RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)).withKeyspaceNotifications();
4040

4141
@Override
42-
protected Collection<RedisServer> servers() {
42+
protected Collection<RedisServer> redisServers() {
4343
return Arrays.asList(REDIS);
4444
}
4545

0 commit comments

Comments
 (0)