This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4fdaf75bf78ca22b5da9bec6d9a9e006dc5b4e2f Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 12:48:38 2020 +0200 [CAMEL-11807] Upgrade camel-spring-redis to junit5 --- components/camel-spring-redis/pom.xml | 4 ++-- .../component/redis/RedisComponentSpringIntegrationTest.java | 10 ++++++---- .../apache/camel/component/redis/RedisConnectionTest.java | 6 ++++-- .../camel/component/redis/RedisConsumerIntegrationTest.java | 6 +++--- .../org/apache/camel/component/redis/RedisConsumerTest.java | 8 +++++--- .../java/org/apache/camel/component/redis/RedisGeoTest.java | 9 +++++---- .../java/org/apache/camel/component/redis/RedisHashTest.java | 6 ++++-- .../java/org/apache/camel/component/redis/RedisKeyTest.java | 6 ++++-- .../java/org/apache/camel/component/redis/RedisListTest.java | 6 ++++-- .../camel/component/redis/RedisProducerIntegrationTest.java | 8 +++++--- .../java/org/apache/camel/component/redis/RedisSetTest.java | 6 ++++-- .../org/apache/camel/component/redis/RedisSortedSetTest.java | 6 ++++-- .../org/apache/camel/component/redis/RedisStringTest.java | 7 +++++-- .../org/apache/camel/component/redis/RedisTestSupport.java | 5 +++-- .../apache/camel/component/redis/RedisTransactionTest.java | 5 +++-- .../processor/idempotent/RedisIdempotentRepositoryTest.java | 10 ++++++---- .../RedisStringIdempotentRepositoryIntegrationTest.java | 12 ++++++++---- .../idempotent/RedisStringIdempotentRepositoryTest.java | 11 +++++------ 18 files changed, 80 insertions(+), 51 deletions(-) diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml index 2c02a17..92dba7e 100644 --- a/components/camel-spring-redis/pom.xml +++ b/components/camel-spring-redis/pom.xml @@ -53,12 +53,12 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java index eefe708..90544aa 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisComponentSpringIntegrationTest.java @@ -21,12 +21,14 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -@Ignore ("IntegrationTest") +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled("IntegrationTest") public class RedisComponentSpringIntegrationTest extends CamelSpringTestSupport { @EndpointInject("direct:start") diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java index b3d6a90..5c86bff 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConnectionTest.java @@ -17,18 +17,20 @@ package org.apache.camel.component.redis; import org.apache.camel.BindToRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisConnectionTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java index 3f86f60..aeb7be0 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerIntegrationTest.java @@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.listener.RedisMessageListenerContainer; -@Ignore +@Disabled public class RedisConsumerIntegrationTest extends RedisTestSupport { private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory(); private static final RedisMessageListenerContainer LISTENER_CONTAINER = new RedisMessageListenerContainer(); diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java index 474fadc..c04bb33 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java @@ -21,22 +21,24 @@ import java.util.Iterator; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.Topic; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisConsumerTest extends CamelTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java index 7e6a9ac..4b466f8 100755 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisGeoTest.java @@ -17,11 +17,12 @@ package org.apache.camel.component.redis; import org.apache.camel.BindToRegistry; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.geo.Circle; import org.springframework.data.geo.Distance; import org.springframework.data.geo.Point; @@ -34,7 +35,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisGeoTest extends RedisTestSupport { @Mock @@ -44,7 +45,7 @@ public class RedisGeoTest extends RedisTestSupport { @Mock private GeoOperations<String, String> geoOperations; - @Before + @BeforeEach public void setupTests() { when(redisTemplate.opsForGeo()).thenReturn(geoOperations); } diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java index 9716062..d11ff00 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisHashTest.java @@ -26,20 +26,22 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisHashTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java index d620caa..a844676 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisKeyTest.java @@ -25,15 +25,17 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.camel.BindToRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.connection.DataType; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.query.SortQuery; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -41,7 +43,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisKeyTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java index c6dfc5f..99c66a4 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisListTest.java @@ -22,20 +22,22 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.ListOperations; import org.springframework.data.redis.core.RedisTemplate; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisListTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java index 77974e7..7c3a5d0 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisProducerIntegrationTest.java @@ -18,12 +18,14 @@ package org.apache.camel.component.redis; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; -@Ignore +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled public class RedisProducerIntegrationTest extends RedisTestSupport { private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory(); diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java index b59c48c..30268ac 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSetTest.java @@ -21,20 +21,22 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.SetOperations; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anySet; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisSetTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java index dcc95d5..200c5e8 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisSortedSetTest.java @@ -21,13 +21,15 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ZSetOperations; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyLong; @@ -35,7 +37,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisSortedSetTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java index 5be5e58..9e857ed 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisStringTest.java @@ -24,20 +24,23 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.ValueOperations; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class RedisStringTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java index c59c945..6108eff 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTestSupport.java @@ -22,13 +22,14 @@ import org.apache.camel.Processor; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisTemplate; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisTestSupport extends CamelTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java index 163da28..db20a8d 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisTransactionTest.java @@ -20,15 +20,16 @@ import java.util.ArrayList; import java.util.List; import org.apache.camel.BindToRegistry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.core.RedisTemplate; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisTransactionTest extends RedisTestSupport { @Mock diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java index b3c61f3..4a0018d 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.redis.processor.idempotent; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; @@ -30,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class RedisIdempotentRepositoryTest { private static final String REPOSITORY = "testRepository"; @@ -47,7 +49,7 @@ public class RedisIdempotentRepositoryTest { private RedisIdempotentRepository idempotentRepository; - @Before + @BeforeEach public void setUp() throws Exception { when(redisTemplate.opsForSet()).thenReturn(setOperations); when(redisTemplate.getConnectionFactory()).thenReturn(redisConnectionFactory); diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java index 8058256..41e4277 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryIntegrationTest.java @@ -26,13 +26,17 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; -@Ignore("requires online connection") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("requires online connection") public class RedisStringIdempotentRepositoryIntegrationTest extends CamelTestSupport { private static final JedisConnectionFactory CONNECTION_FACTORY = new JedisConnectionFactory(); diff --git a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java index fd208bc..133a2b6 100644 --- a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java +++ b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisStringIdempotentRepositoryTest.java @@ -18,11 +18,10 @@ package org.apache.camel.component.redis.processor.idempotent; import java.time.Duration; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoSettings; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisOperations; @@ -33,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@MockitoSettings public class RedisStringIdempotentRepositoryTest { private static final String REPOSITORY = "testRepository"; @@ -54,7 +53,7 @@ public class RedisStringIdempotentRepositoryTest { private RedisStringIdempotentRepository idempotentRepository; private RedisStringIdempotentRepository idempotentRepositoryNoExpiry; - @Before + @BeforeEach public void setUp() throws Exception { when(redisTemplate.opsForValue()).thenReturn(valueOperations); idempotentRepository = new RedisStringIdempotentRepository(redisTemplate, REPOSITORY);
