Skip to content

Commit 09d6662

Browse files
oxcafedeadoxcafedead
committed
spring-projectsGH-3840: Migrate Redis tests to Testcontainers
Fix a couple of small changes after the code review: * Change base interface name to be consistent with other similar places * Typo in javadocs
1 parent 5b3519a commit 09d6662

File tree

40 files changed

+128
-127
lines changed

40 files changed

+128
-127
lines changed

‎spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.springframework.integration.gemfire.metadata.GemfireMetadataStore;
3939
import org.springframework.integration.jdbc.metadata.JdbcMetadataStore;
4040
import org.springframework.integration.metadata.ConcurrentMetadataStore;
41-
import org.springframework.integration.redis.RedisTest;
41+
import org.springframework.integration.redis.RedisContainerTest;
4242
import org.springframework.integration.redis.metadata.RedisMetadataStore;
4343
import org.springframework.jdbc.core.JdbcTemplate;
4444
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -54,13 +54,13 @@
5454
* @since 4.0
5555
*
5656
*/
57-
public class PersistentAcceptOnceFileListFilterExternalStoreTests implements RedisTest {
57+
public class PersistentAcceptOnceFileListFilterExternalStoreTests implements RedisContainerTest {
5858

5959
static RedisConnectionFactory redisConnectionFactory;
6060

6161
@BeforeAll
6262
static void setupConnectionFactory() {
63-
redisConnectionFactory = RedisTest.connectionFactory();
63+
redisConnectionFactory = RedisContainerTest.connectionFactory();
6464
}
6565

6666
@Test

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisTest.java renamed to ‎spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
/**
4545
* The base contract for all tests requiring a Redis connection.
46-
* The Testcontainers 'reuse' option must be disabled,so, Ryuk container is started
46+
* The Testcontainers 'reuse' option must be disabled, so, Ryuk container is started
4747
* and will clean all the containers up from this test suite after JVM exit.
4848
* Since the Redis container instance is shared via static property, it is going to be
4949
* started only once per JVM, therefore the target Docker container is reused automatically.
@@ -56,7 +56,7 @@
5656
* @since 6.0
5757
*/
5858
@Testcontainers(disabledWithoutDocker = true)
59-
public interface RedisTest {
59+
public interface RedisContainerTest {
6060

6161
GenericContainer<?> REDIS_CONTAINER = new GenericContainer<>("redis:7.0.2")
6262
.withExposedPorts(6379);

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.data.redis.connection.RedisConnectionFactory;
3434
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
3535
import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
36-
import org.springframework.integration.redis.RedisTest;
36+
import org.springframework.integration.redis.RedisContainerTest;
3737
import org.springframework.integration.test.util.TestUtils;
3838
import org.springframework.messaging.MessageHandler;
3939
import org.springframework.messaging.support.GenericMessage;
@@ -46,12 +46,12 @@
4646
* @author Artem Vozhdayenko
4747
* @since 2.0
4848
*/
49-
class SubscribableRedisChannelTests implements RedisTest {
49+
class SubscribableRedisChannelTests implements RedisContainerTest {
5050
private static RedisConnectionFactory redisConnectionFactory;
5151

5252
@BeforeAll
5353
static void setupConnection() {
54-
redisConnectionFactory = RedisTest.connectionFactory();
54+
redisConnectionFactory = RedisContainerTest.connectionFactory();
5555
}
5656

5757
@Test
@@ -62,7 +62,7 @@ void pubSubChannelTest() throws Exception {
6262
channel.afterPropertiesSet();
6363
channel.start();
6464

65-
RedisTest.awaitContainerSubscribed(TestUtils.getPropertyValue(channel, "container",
65+
RedisContainerTest.awaitContainerSubscribed(TestUtils.getPropertyValue(channel, "container",
6666
RedisMessageListenerContainer.class));
6767

6868
final CountDownLatch latch = new CountDownLatch(3);

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
77

8-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
8+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
99
factory-method="connectionFactory"/>
1010

1111
<int-redis:publish-subscribe-channel id="redisChannel" topic-name="si.test.topic.parser"

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.data.redis.connection.RedisConnectionFactory;
3131
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
3232
import org.springframework.data.redis.serializer.RedisSerializer;
33-
import org.springframework.integration.redis.RedisTest;
33+
import org.springframework.integration.redis.RedisContainerTest;
3434
import org.springframework.integration.redis.channel.SubscribableRedisChannel;
3535
import org.springframework.integration.support.utils.IntegrationUtils;
3636
import org.springframework.integration.test.util.TestUtils;
@@ -48,7 +48,7 @@
4848
*/
4949
@SpringJUnitConfig
5050
@DirtiesContext
51-
class RedisChannelParserTests implements RedisTest {
51+
class RedisChannelParserTests implements RedisContainerTest {
5252

5353
@Autowired
5454
private SubscribableRedisChannel redisChannel;
@@ -93,7 +93,7 @@ void testPubSubChannelConfig() {
9393

9494
@Test
9595
void testPubSubChannelUsage() throws Exception {
96-
RedisTest.awaitContainerSubscribed(TestUtils.getPropertyValue(this.redisChannel, "container",
96+
RedisContainerTest.awaitContainerSubscribed(TestUtils.getPropertyValue(this.redisChannel, "container",
9797
RedisMessageListenerContainer.class));
9898

9999
final Message<?> m = new GenericMessage<>("Hello Redis");

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
88
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
99

10-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
10+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
1111
factory-method="connectionFactory"/>
1212

1313
<int-redis:inbound-channel-adapter

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.redis.connection.RedisConnectionFactory;
3030
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
3131
import org.springframework.integration.channel.QueueChannel;
32-
import org.springframework.integration.redis.RedisTest;
32+
import org.springframework.integration.redis.RedisContainerTest;
3333
import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter;
3434
import org.springframework.integration.support.converter.SimpleMessageConverter;
3535
import org.springframework.integration.test.util.TestUtils;
@@ -49,7 +49,7 @@
4949
*/
5050
@SpringJUnitConfig
5151
@DirtiesContext
52-
class RedisInboundChannelAdapterParserTests implements RedisTest {
52+
class RedisInboundChannelAdapterParserTests implements RedisContainerTest {
5353

5454
@Autowired
5555
private ApplicationContext context;
@@ -93,7 +93,7 @@ void validateConfiguration() {
9393
void testInboundChannelAdapterMessaging() throws Exception {
9494
RedisInboundChannelAdapter adapter = context.getBean("adapter", RedisInboundChannelAdapter.class);
9595
adapter.start();
96-
RedisTest.awaitContainerSubscribedWithPatterns(TestUtils.getPropertyValue(adapter, "container",
96+
RedisContainerTest.awaitContainerSubscribedWithPatterns(TestUtils.getPropertyValue(adapter, "container",
9797
RedisMessageListenerContainer.class));
9898

9999
redisConnectionFactory.getConnection().publish("foo".getBytes(), "Hello Redis from foo".getBytes());

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
88
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
99

10-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
10+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
1111
factory-method="connectionFactory"/>
1212

1313
<int:channel id="sendChannel"/>

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.integration.channel.QueueChannel;
3333
import org.springframework.integration.endpoint.EventDrivenConsumer;
3434
import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice;
35-
import org.springframework.integration.redis.RedisTest;
35+
import org.springframework.integration.redis.RedisContainerTest;
3636
import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter;
3737
import org.springframework.integration.support.MessageBuilder;
3838
import org.springframework.integration.support.converter.SimpleMessageConverter;
@@ -53,7 +53,7 @@
5353
*/
5454
@SpringJUnitConfig
5555
@DirtiesContext
56-
class RedisOutboundChannelAdapterParserTests implements RedisTest {
56+
class RedisOutboundChannelAdapterParserTests implements RedisContainerTest {
5757

5858
@Autowired
5959
private ApplicationContext context;
@@ -101,7 +101,7 @@ void validateConfiguration() {
101101
@Test
102102
void testOutboundChannelAdapterMessaging() throws Exception {
103103
MessageChannel sendChannel = context.getBean("sendChannel", MessageChannel.class);
104-
RedisTest.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container",
104+
RedisContainerTest.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container",
105105
RedisMessageListenerContainer.class));
106106
sendChannel.send(new GenericMessage<>("Hello Redis"));
107107
QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class);
@@ -121,7 +121,7 @@ void testOutboundChannelAdapterMessaging() throws Exception {
121121
//INT-2275
122122
void testOutboundChannelAdapterWithinChain() throws Exception {
123123
MessageChannel sendChannel = context.getBean("redisOutboundChain", MessageChannel.class);
124-
RedisTest.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container",
124+
RedisContainerTest.awaitContainerSubscribed(TestUtils.getPropertyValue(fooInbound, "container",
125125
RedisMessageListenerContainer.class));
126126
sendChannel.send(new GenericMessage<>("Hello Redis from chain"));
127127
QueueChannel receiveChannel = context.getBean("receiveChannel", QueueChannel.class);

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
88
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
99

10-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
10+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
1111
factory-method="connectionFactory"/>
1212

1313
<int:channel id="sendChannel"/>

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.data.redis.serializer.StringRedisSerializer;
3131
import org.springframework.integration.channel.DirectChannel;
3232
import org.springframework.integration.channel.QueueChannel;
33-
import org.springframework.integration.redis.RedisTest;
33+
import org.springframework.integration.redis.RedisContainerTest;
3434
import org.springframework.integration.redis.inbound.RedisQueueInboundGateway;
3535
import org.springframework.integration.redis.outbound.RedisQueueOutboundGateway;
3636
import org.springframework.integration.test.util.TestUtils;
@@ -48,7 +48,7 @@
4848
*/
4949
@SpringJUnitConfig
5050
@DirtiesContext
51-
class RedisQueueGatewayIntegrationTests implements RedisTest {
51+
class RedisQueueGatewayIntegrationTests implements RedisContainerTest {
5252

5353
@Value("#{redisQueue.toString().bytes}")
5454
private byte[] queueName;

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/config/inbound-template-cf-fail.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
88
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd">
99

10-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
10+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
1111
factory-method="connectionFactory"/>
1212

1313
<int-redis:store-inbound-channel-adapter id="listAdapterWithSynchronizationAndRedisTemplate"

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.springframework.integration.channel.FluxMessageChannel;
4444
import org.springframework.integration.channel.QueueChannel;
4545
import org.springframework.integration.handler.ReactiveMessageHandlerAdapter;
46-
import org.springframework.integration.redis.RedisTest;
46+
import org.springframework.integration.redis.RedisContainerTest;
4747
import org.springframework.integration.redis.outbound.ReactiveRedisStreamMessageHandler;
4848
import org.springframework.integration.redis.support.RedisHeaders;
4949
import org.springframework.integration.redis.util.Address;
@@ -70,7 +70,7 @@
7070
*/
7171
@SpringJUnitConfig
7272
@DirtiesContext
73-
class ReactiveRedisStreamMessageProducerTests implements RedisTest {
73+
class ReactiveRedisStreamMessageProducerTests implements RedisContainerTest {
7474

7575
private static final String STREAM_KEY = ReactiveRedisStreamMessageProducerTests.class.getSimpleName() + ".stream";
7676

@@ -291,7 +291,7 @@ static class ContextConfig {
291291

292292
@Bean
293293
ReactiveRedisConnectionFactory redisConnectionFactory() {
294-
return RedisTest.connectionFactory();
294+
return RedisContainerTest.connectionFactory();
295295
}
296296

297297
@Bean

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.data.redis.core.StringRedisTemplate;
2929
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
3030
import org.springframework.integration.channel.QueueChannel;
31-
import org.springframework.integration.redis.RedisTest;
31+
import org.springframework.integration.redis.RedisContainerTest;
3232
import org.springframework.integration.redis.support.RedisHeaders;
3333
import org.springframework.integration.test.util.TestUtils;
3434
import org.springframework.messaging.Message;
@@ -41,12 +41,12 @@
4141
*
4242
* @since 2.1
4343
*/
44-
class RedisInboundChannelAdapterTests implements RedisTest {
44+
class RedisInboundChannelAdapterTests implements RedisContainerTest {
4545
private static RedisConnectionFactory redisConnectionFactory;
4646

4747
@BeforeAll
4848
static void setupConnection() {
49-
redisConnectionFactory = RedisTest.connectionFactory();
49+
redisConnectionFactory = RedisContainerTest.connectionFactory();
5050
}
5151

5252
@Test
@@ -73,7 +73,7 @@ private void testRedisInboundChannelAdapterGuts(int iteration) throws Exception
7373
StringRedisTemplate redisTemplate = new StringRedisTemplate(connectionFactory);
7474
redisTemplate.afterPropertiesSet();
7575

76-
RedisTest.awaitFullySubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class),
76+
RedisContainerTest.awaitFullySubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class),
7777
redisTemplate, redisChannelName, channel, "foo");
7878

7979
for (int i = 0; i < numToTest; i++) {
@@ -107,7 +107,7 @@ private void testRedisInboundChannelAdapterGuts(int iteration) throws Exception
107107
template.setEnableDefaultSerializer(false);
108108
template.afterPropertiesSet();
109109

110-
RedisTest.awaitFullySubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class),
110+
RedisContainerTest.awaitFullySubscribed(TestUtils.getPropertyValue(adapter, "container", RedisMessageListenerContainer.class),
111111
template, redisChannelName, channel, "foo".getBytes());
112112

113113
for (int i = 0; i < numToTest; i++) {

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
http://www.springframework.org/schema/integration/redis https://www.springframework.org/schema/integration/redis/spring-integration-redis.xsd
1010
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
1111

12-
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisTest"
12+
<bean id="redisConnectionFactory" class="org.springframework.integration.redis.RedisContainerTest"
1313
factory-method="connectionFactory"/>
1414

1515
<util:constant id="TEST_QUEUE"

‎spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import org.springframework.integration.channel.DirectChannel;
5454
import org.springframework.integration.channel.QueueChannel;
5555
import org.springframework.integration.events.IntegrationEvent;
56-
import org.springframework.integration.redis.RedisTest;
56+
import org.springframework.integration.redis.RedisContainerTest;
5757
import org.springframework.integration.redis.event.RedisExceptionEvent;
5858
import org.springframework.integration.support.MessageBuilder;
5959
import org.springframework.integration.test.util.TestUtils;
@@ -77,7 +77,7 @@
7777
*/
7878
@SpringJUnitConfig
7979
@DirtiesContext
80-
class RedisQueueMessageDrivenEndpointTests implements RedisTest {
80+
class RedisQueueMessageDrivenEndpointTests implements RedisContainerTest {
8181

8282
public static final String TEST_QUEUE = UUID.randomUUID().toString();
8383

0 commit comments

Comments
 (0)