From 4b2e2e05b519d4996a22ddc4ecebb39f1ab51c0d Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Mon, 17 Oct 2022 17:05:24 -0500
Subject: [PATCH] [SB3 Update] RedisSink use testcontainers

---
 applications/sink/redis-sink/pom.xml           | 18 ++++++++++++------
 .../stream/app/sink/redis/RedisSinkTests.java  |  5 ++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/applications/sink/redis-sink/pom.xml b/applications/sink/redis-sink/pom.xml
index e4de5259..59113fe4 100644
--- a/applications/sink/redis-sink/pom.xml
+++ b/applications/sink/redis-sink/pom.xml
@@ -24,12 +24,18 @@
             <artifactId>redis-consumer</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.playtika.testcontainers</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <version>${embedded-redis.version}</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>redis-common</artifactId>
+			<version>4.0.0-SNAPSHOT</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
diff --git a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
index 537a9a80..f89e7c3d 100644
--- a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
+++ b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java
@@ -25,6 +25,7 @@ import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.fn.consumer.redis.RedisConsumerConfiguration;
+import org.springframework.cloud.fn.consumer.redis.RedisTestContainerSupport;
 import org.springframework.cloud.stream.binder.test.InputDestination;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -40,8 +41,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Soby Chacko
  * @author Artem Bilan
+ * @author Chris Bono
  */
-public class RedisSinkTests {
+public class RedisSinkTests implements RedisTestContainerSupport {
 
 	@Test
 	public void testRedisSink() {
@@ -50,6 +52,7 @@ public class RedisSinkTests {
 						.getCompleteConfiguration(RedisSinkTestApplication.class))
 				.web(WebApplicationType.NONE)
 				.run("--spring.cloud.function.definition=redisConsumer",
+						"--spring.data.redis.url=" + RedisTestContainerSupport.getUri(),
 						"--redis.consumer.key=foo")) {
 
 			//Setup