This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6017a86eff6409dfd51005a7fd445ef2527db523 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Sat Oct 28 12:57:31 2017 +0200 CAMEL-11869: Upgrade mockito-core to 2.11.0 for camel-hazelcast --- components/camel-hazelcast/pom.xml | 1 + .../camel/component/hazelcast/HazelcastInstanceConsumerTest.java | 2 +- .../camel/component/hazelcast/HazelcastMapConsumerTest.java | 4 ++-- .../component/hazelcast/HazelcastMapProducerForSpringTest.java | 4 ++-- .../camel/component/hazelcast/HazelcastMultimapConsumerTest.java | 4 ++-- .../camel/component/hazelcast/HazelcastQueueConsumerTest.java | 4 ++-- .../component/hazelcast/HazelcastReliableTopicConsumerTest.java | 2 +- .../component/hazelcast/HazelcastReplicatedmapConsumerTest.java | 4 ++-- .../hazelcast/HazelcastRingbufferProducerForSpringTest.java | 6 +++--- .../component/hazelcast/HazelcastRingbufferProducerTest.java | 8 ++++---- .../component/hazelcast/HazelcastSedaRecoverableConsumerTest.java | 2 +- .../camel/component/hazelcast/HazelcastTopicConsumerTest.java | 2 +- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index e5f0eb3..84b65fb 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -89,6 +89,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java index df37300..f45cc83 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java index fa65710..10b254b 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java @@ -30,8 +30,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java index 637c70d..6a5248e 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java @@ -35,8 +35,8 @@ import org.mockito.Mock; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anySet; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anySet; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java index a4bbbad..f965be0 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java index 65309d6..df76515 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java @@ -30,8 +30,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java index 0d3af1a..9137e86 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java index c7ef1cc..7bee934 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java index fbc4c8e..911b157 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerForSpringTest.java @@ -20,7 +20,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.ringbuffer.Ringbuffer; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -51,14 +51,14 @@ public class HazelcastRingbufferProducerForSpringTest extends HazelcastCamelSpri @Test public void testReadTail() throws InterruptedException { - when(ringbuffer.readOne(Matchers.anyLong())).thenReturn("pippo"); + when(ringbuffer.readOne(ArgumentMatchers.anyLong())).thenReturn("pippo"); Object result = template.requestBody("direct:readonceTail", 12L, String.class); assertEquals("pippo", result); } @Test public void testAdd() throws InterruptedException { - when(ringbuffer.add(Matchers.anyLong())).thenReturn(13L); + when(ringbuffer.add(ArgumentMatchers.anyLong())).thenReturn(13L); Object result = template.requestBody("direct:add", 12L, Long.class); assertEquals(13L, result); } diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java index 4180245..27eb175 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java @@ -21,7 +21,7 @@ import com.hazelcast.ringbuffer.Ringbuffer; import org.apache.camel.builder.RouteBuilder; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import static org.mockito.Mockito.atLeastOnce; @@ -45,21 +45,21 @@ public class HazelcastRingbufferProducerTest extends HazelcastCamelTestSupport { @Test public void testReadHead() throws InterruptedException { - when(ringbuffer.readOne(Matchers.anyLong())).thenReturn("pippo"); + when(ringbuffer.readOne(ArgumentMatchers.anyLong())).thenReturn("pippo"); Object result = template.requestBody("direct:READ_ONCE_HEAD", 12L, String.class); assertEquals("pippo", result); } @Test public void testReadTail() throws InterruptedException { - when(ringbuffer.readOne(Matchers.anyLong())).thenReturn("pippo"); + when(ringbuffer.readOne(ArgumentMatchers.anyLong())).thenReturn("pippo"); Object result = template.requestBody("direct:READ_ONCE_TAIL", 12L, String.class); assertEquals("pippo", result); } @Test public void testAdd() throws InterruptedException { - when(ringbuffer.add(Matchers.anyLong())).thenReturn(13L); + when(ringbuffer.add(ArgumentMatchers.anyLong())).thenReturn(13L); Object result = template.requestBody("direct:add", 12L, Long.class); assertEquals(13L, result); } diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java index 00c8fe3..f194783 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaRecoverableConsumerTest.java @@ -27,7 +27,7 @@ import org.junit.After; import org.junit.Test; import org.mockito.Mock; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; public abstract class HazelcastSedaRecoverableConsumerTest extends HazelcastCamelTestSupport { diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java index 9be9c05..7da2f85 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" <commits@camel.apache.org>.