Upodated aggregator RedisMessageStoreAggregatorTests to use RedisTest…

…ContainerSupport.
onobc · Jan 11, 2023 · 570a8ec · 570a8ec
1 parent 3aa662f
commit 570a8ec
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/applications/sink/redis-sink/pom.xml b/applications/sink/redis-sink/pom.xml
@@ -14,10 +14,6 @@
         <relativePath>../../stream-applications-core/pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <embedded-redis.version>2.0.11</embedded-redis.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud.fn</groupId>

diff --git a/.../src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java b/.../src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java
@@ -29,7 +29,7 @@
  */
 @Testcontainers(disabledWithoutDocker = true)
 public interface RedisTestContainerSupport {
-	GenericContainer<?> REDIS_CONTAINER = new GenericContainer<>("redis:7.0.2")
+	GenericContainer<?> REDIS_CONTAINER = new GenericContainer<>("redis:7")
 		.withExposedPorts(6379)
 		.withStartupTimeout(Duration.ofSeconds(120))
 		.withStartupAttempts(3);

diff --git a/functions/function/aggregator-function/pom.xml b/functions/function/aggregator-function/pom.xml
@@ -51,6 +51,13 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud.fn</groupId>
+            <artifactId>redis-common</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <!--JDBC-->
         <dependency>
             <groupId>org.springframework.integration</groupId>

diff --git a/...c/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java b/...c/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java
@@ -19,15 +19,17 @@
 import java.time.Duration;
 import java.util.List;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
+import org.springframework.cloud.fn.consumer.redis.RedisTestContainerSupport;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
 import org.springframework.integration.redis.store.RedisMessageStore;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,35 +38,38 @@
  * @author Artem Bilan
  */
 @TestPropertySource(properties = "aggregator.message-store-type=redis")
-@Disabled("Needs real Redis Server to be run") // TODO add redis test container
-public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests {
+public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests implements RedisTestContainerSupport {
+	@DynamicPropertySource
+	static void redisProperties(DynamicPropertyRegistry registry) {
+		registry.add("spring.data.redis.url", RedisTestContainerSupport::getUri);
+	}
 
 	@Test
 	public void test() {
 		Flux<Message<?>> input =
-				Flux.just(MessageBuilder.withPayload("2")
-								.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
-								.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
-								.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
-								.build(),
-						MessageBuilder.withPayload("1")
-								.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
-								.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 1)
-								.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
-								.build());
+			Flux.just(MessageBuilder.withPayload("2")
+					.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
+					.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
+					.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
+					.build(),
+				MessageBuilder.withPayload("1")
+					.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
+					.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 1)
+					.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
+					.build());
 
 		Flux<Message<?>> output = this.aggregatorFunction.apply(input);
 
 		output.as(StepVerifier::create)
-				.assertNext((message) ->
-						assertThat(message)
-								.extracting(Message::getPayload)
-								.isInstanceOf(List.class)
-								.asList()
-								.hasSize(2)
-								.contains("1", "2"))
-				.thenCancel()
-				.verify(Duration.ofSeconds(10));
+			.assertNext((message) ->
+				assertThat(message)
+					.extracting(Message::getPayload)
+					.isInstanceOf(List.class)
+					.asList()
+					.hasSize(2)
+					.contains("1", "2"))
+			.thenCancel()
+			.verify(Duration.ofSeconds(10));
 
 		assertThat(this.messageGroupStore).isInstanceOf(RedisMessageStore.class);