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 d3fc30bd11a67b3eed63c064cc32b3a09edb4e0c Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 14:32:16 2020 +0200 [CAMEL-11807] Upgrade camel-spring-redis to junit5 --- .../java/org/apache/camel/component/redis/RedisConnectionTest.java | 2 -- .../test/java/org/apache/camel/component/redis/RedisConsumerTest.java | 2 -- .../src/test/java/org/apache/camel/component/redis/RedisGeoTest.java | 2 -- .../src/test/java/org/apache/camel/component/redis/RedisHashTest.java | 2 -- .../src/test/java/org/apache/camel/component/redis/RedisKeyTest.java | 2 -- .../src/test/java/org/apache/camel/component/redis/RedisListTest.java | 2 -- .../src/test/java/org/apache/camel/component/redis/RedisSetTest.java | 2 -- .../java/org/apache/camel/component/redis/RedisSortedSetTest.java | 2 -- .../test/java/org/apache/camel/component/redis/RedisStringTest.java | 2 -- .../test/java/org/apache/camel/component/redis/RedisTestSupport.java | 2 -- .../java/org/apache/camel/component/redis/RedisTransactionTest.java | 2 -- .../redis/processor/idempotent/RedisIdempotentRepositoryTest.java | 4 +--- .../processor/idempotent/RedisStringIdempotentRepositoryTest.java | 2 +- 13 files changed, 2 insertions(+), 26 deletions(-) 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 5c86bff..88720ce 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 @@ -18,10 +18,8 @@ package org.apache.camel.component.redis; import org.apache.camel.BindToRegistry; 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; 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 c04bb33..51fb174 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 @@ -23,11 +23,9 @@ import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; 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; 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 4b466f8..516bcae 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 @@ -19,9 +19,7 @@ package org.apache.camel.component.redis; import org.apache.camel.BindToRegistry; 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; 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 d11ff00..cf3b7c7 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 @@ -27,9 +27,7 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; 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; 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 a844676..26552a6 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 @@ -26,10 +26,8 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.BindToRegistry; 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; 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 99c66a4..a30eea8 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 @@ -23,9 +23,7 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; 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; 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 30268ac..e2065aa 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 @@ -22,9 +22,7 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; 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; 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 200c5e8..b92123e 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 @@ -22,9 +22,7 @@ import java.util.Set; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; 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; 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 9e857ed..0a7f49f 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 @@ -25,10 +25,8 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; 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; 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 6108eff..64af992 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 @@ -23,9 +23,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; 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; 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 db20a8d..e8ceef0 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 @@ -21,9 +21,7 @@ import java.util.List; import org.apache.camel.BindToRegistry; 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; 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 4a0018d..92a77ae 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 @@ -18,9 +18,7 @@ package org.apache.camel.component.redis.processor.idempotent; 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; @@ -28,7 +26,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.SetOperations; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; 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 133a2b6..7b9ac1d 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 @@ -28,7 +28,7 @@ import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;
