Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Redis 7.2 for build.

Browse Source 
Update jenkinsfile to test against redis 7.2
Replace usage of DEBUG command.
Provide Redis server version and client lib version to maven build system / gradle cache.

Original Pull Request: #2802
This commit is contained in:
Christoph Strobl
2024-01-30 14:16:39 +01:00
parent 4da3169a0b
commit 505fd846ae
11 changed files with 78 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -28,6 +28,7 @@ import static org.springframework.data.redis.connection.RedisGeoCommands.GeoRadi
import static org.springframework.data.redis.connection.RedisGeoCommands.GeoSearchStoreCommandArgs.*;
import static org.springframework.data.redis.core.ScanOptions.*;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -35,6 +36,7 @@ import java.util.*;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
import org.assertj.core.data.Offset;
import org.junit.AssumptionViolatedException;
@@ -2661,10 +2663,11 @@ public abstract class AbstractConnectionIntegrationTests {
}
@Test // DATAREDIS-417
@DisabledOnOs(value = MAC, architectures = "aarch64")
public void scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection() {
public void scanShouldReadEntireValueRangeWhenIndividualScanIterationsReturnEmptyCollection() {
connection.execute("DEBUG", "POPULATE".getBytes(), "100".getBytes());
byteConnection.openPipeline();
IntStream.range(0, 100).forEach(it -> byteConnection.stringCommands().set("key:%s".formatted(it).getBytes(StandardCharsets.UTF_8), "data".getBytes(StandardCharsets.UTF_8)));
byteConnection.closePipeline();
Cursor<byte[]> cursor = connection.scan(ScanOptions.scanOptions().match("key*9").count(10).build());

4
src/test/java/org/springframework/data/redis/connection/AbstractConnectionPipelineIntegrationTests.java
View File

@@ -149,8 +149,8 @@ abstract public class AbstractConnectionPipelineIntegrationTests extends Abstrac
@Test // DATAREDIS-417
@Disabled
@Override
public void scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection() {
super.scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection();
public void scanShouldReadEntireValueRangeWhenIndividualScanIterationsReturnEmptyCollection() {
super.scanShouldReadEntireValueRangeWhenIndividualScanIterationsReturnEmptyCollection();
}
@Override

4
src/test/java/org/springframework/data/redis/connection/AbstractConnectionTransactionIntegrationTests.java
View File

@@ -144,8 +144,8 @@ abstract public class AbstractConnectionTransactionIntegrationTests extends Abst
@Test // DATAREDIS-417
@Disabled
@Override
public void scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection() {
super.scanShouldReadEntireValueRangeWhenIdividualScanIterationsReturnEmptyCollection();
public void scanShouldReadEntireValueRangeWhenIndividualScanIterationsReturnEmptyCollection() {
super.scanShouldReadEntireValueRangeWhenIndividualScanIterationsReturnEmptyCollection();
}
@Override

2
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommandsIntegrationTests.java
View File

@@ -195,7 +195,7 @@ class LettuceReactiveClusterServerCommandsIntegrationTests extends LettuceReacti
connection.serverCommands().getConfig(NODE1, "*").as(StepVerifier::create) //
.consumeNextWith(properties -> {
assertThat(properties).containsEntry("databases", "16");
assertThat(properties).containsEntry("port", NODE1.getPort().toString());
}) //
.verifyComplete();
}

3
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommandsIntegrationTests.java
View File

@@ -201,8 +201,7 @@ public class LettuceReactiveServerCommandsIntegrationTests extends LettuceReacti
connection.serverCommands().getConfig("*").as(StepVerifier::create) //
.consumeNextWith(properties -> {
assertThat(properties).containsEntry("127.0.0.1:7379.databases", "16");
assertThat(properties).containsEntry("127.0.0.1:7379.port", "7379");
}) //
.verifyComplete();
} else {