Skip to content

JSON integration tests now do not use the test-containers framework #3203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2025
Merged

JSON integration tests now do not use the test-containers framework #3203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
512869f
Remove testcontainers for the purpose of JSON tests
tishun Mar 6, 2025
5cf803d
Missed three tests
tishun Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/test/java/io/lettuce/core/commands/CommandInterfacesIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,33 @@
package io.lettuce.core.commands;

import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisContainerIntegrationTests;
import io.lettuce.core.RedisURI;
import io.lettuce.core.TestSupport;
import io.lettuce.core.api.StatefulConnection;
import io.lettuce.core.api.StatefulRedisConnection;
import io.lettuce.core.api.sync.RedisCommands;
import io.lettuce.core.dynamic.Commands;
import io.lettuce.core.dynamic.RedisCommandFactory;
import io.lettuce.core.dynamic.annotation.Command;
import io.lettuce.core.dynamic.annotation.Param;
import io.lettuce.test.LettuceExtension;
import io.lettuce.test.condition.EnabledOnCommand;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import reactor.core.publisher.Flux;

import javax.inject.Inject;
import java.lang.reflect.Proxy;
import java.util.List;

import static io.lettuce.TestTags.INTEGRATION_TEST;
import static io.lettuce.core.SetArgs.Builder.ex;
import static io.lettuce.core.SetArgs.Builder.exAt;
import static io.lettuce.core.SetArgs.Builder.px;
import static io.lettuce.core.SetArgs.Builder.pxAt;
import static io.lettuce.core.StringMatchResult.Position;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/**
* Integration tests for {@link io.lettuce.core.dynamic.annotation.Command}.
*
* @author Tihomir Mateev
*/
@Tag(INTEGRATION_TEST)
public class CommandInterfacesIntegrationTests extends RedisContainerIntegrationTests {
public class CommandInterfacesIntegrationTests {

protected static RedisClient client;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/lettuce/core/commands/ConsolidatedAclCommandIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* @author M Sazzadul Hoque
*/
@Tag(INTEGRATION_TEST)
public class ConsolidatedAclCommandIntegrationTests extends RedisContainerIntegrationTests {
public class ConsolidatedAclCommandIntegrationTests {

private static RedisClient client;

Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/lettuce/core/commands/ConsolidatedConfigurationCommandIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@
import org.junit.jupiter.api.*;

import java.util.Collections;
import java.util.Map;

/**
* Integration tests for {@link io.lettuce.core.api.sync.RedisServerCommands} with Redis modules since Redis 8.0.
*
* @author M Sazzadul Hoque
*/
@Tag(INTEGRATION_TEST)
public class ConsolidatedConfigurationCommandIntegrationTests extends RedisContainerIntegrationTests {
public class ConsolidatedConfigurationCommandIntegrationTests {

private static RedisClient client;

Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package io.lettuce.core.json;

import io.lettuce.core.RedisContainerIntegrationTests;
import io.lettuce.core.RedisURI;
import io.lettuce.core.cluster.RedisClusterClient;
import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
Expand Down Expand Up @@ -39,7 +38,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@Tag(INTEGRATION_TEST)
public class RedisJsonClusterIntegrationTests extends RedisContainerIntegrationTests {
public class RedisJsonClusterIntegrationTests {

protected static RedisClusterClient client;

Expand Down
4 changes: 1 addition & 3 deletions src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import io.lettuce.core.ClientOptions;
import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisContainerIntegrationTests;
import io.lettuce.core.RedisFuture;
import io.lettuce.core.RedisURI;
import io.lettuce.core.api.StatefulRedisConnection;
Expand All @@ -26,7 +25,6 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

import java.io.IOException;
Expand All @@ -43,7 +41,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@Tag(INTEGRATION_TEST)
public class RedisJsonIntegrationTests extends RedisContainerIntegrationTests {
public class RedisJsonIntegrationTests {

private static final String BIKES_INVENTORY = "bikes:inventory";

Expand Down
17 changes: 17 additions & 0 deletions src/test/resources/docker-env/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
x-client-libs-image: &client-libs-image
image: "redislabs/client-libs-test:${REDIS_VERSION:-8.0-M04-pre}"
x-client-libs-stack-image: &client-libs-stack-image
image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.0-M04-pre}"
Copy link
Contributor

@ggivo ggivo Mar 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Existing Makefile & workflows/integration.yaml need to be updated to propagate REDIS_STACK_VERSION to docker-compose. otherwise we will always run with the default version (8.0-M04-pre currently) disregarding of the selected test version.

Currently only REDIS_VERSION is propagated.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?
Did it not work before?


services:
# Standalone Redis Servers
Expand Down Expand Up @@ -101,6 +103,21 @@ services:
networks:
- redis-network

standalone-stack:
<<: *client-libs-stack-image
environment:
- REDIS_CLUSTER=no
- PORT=6379
ports:
- "16379:6379"

clustered-stack:
<<: *client-libs-stack-image
environment:
- REDIS_CLUSTER=yes
- PORT=36379
ports:
- "36379-36381:36379-36381"

ssl-test-cluster:
<<: *client-libs-image
Expand Down