You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2017/10/29 13:04:20 UTC
[camel] 02/02: CAMEL-11869: Fixed some mockito flaky tests for
camel-hazelcast
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 0044752452e99c41db6952cc0bbc439f92525d7f
Author: aldettinger <al...@gmail.com>
AuthorDate: Sun Oct 29 13:52:47 2017 +0100
CAMEL-11869: Fixed some mockito flaky tests for camel-hazelcast
---
.../component/hazelcast/HazelcastComponent.java | 21 +--------------------
.../hazelcast/list/HazelcastListEndpoint.java | 1 -
.../hazelcast/seda/HazelcastSedaEndpoint.java | 1 -
.../hazelcast/HazelcastCamelTestSupport.java | 2 --
.../hazelcast/HazelcastInstanceConsumerTest.java | 4 +++-
.../hazelcast/HazelcastListConsumerTest.java | 12 ++++++------
.../hazelcast/HazelcastMapConsumerTest.java | 17 +++++++++--------
.../hazelcast/HazelcastMultimapConsumerTest.java | 14 +++++++-------
.../hazelcast/HazelcastQueueConsumerPollTest.java | 3 ---
.../hazelcast/HazelcastQueueConsumerTest.java | 12 ++++++------
.../HazelcastReliableTopicConsumerTest.java | 10 +++++-----
.../HazelcastReplicatedmapConsumerTest.java | 14 +++++++-------
.../hazelcast/HazelcastSetConsumerTest.java | 12 ++++++------
.../hazelcast/HazelcastTopicConsumerTest.java | 10 +++++-----
14 files changed, 55 insertions(+), 78 deletions(-)
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
index 4d270db..325e165 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponent.java
@@ -16,20 +16,10 @@
*/
package org.apache.camel.component.hazelcast;
-import java.io.InputStream;
-import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Set;
-
-import com.hazelcast.client.HazelcastClient;
-import com.hazelcast.client.config.ClientConfig;
-import com.hazelcast.client.config.XmlClientConfigBuilder;
-import com.hazelcast.config.Config;
-import com.hazelcast.config.XmlConfigBuilder;
-import com.hazelcast.core.Hazelcast;
+
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
import org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberEndpoint;
import org.apache.camel.component.hazelcast.instance.HazelcastInstanceEndpoint;
import org.apache.camel.component.hazelcast.list.HazelcastListEndpoint;
@@ -44,19 +34,10 @@ import org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpoint;
import org.apache.camel.component.hazelcast.set.HazelcastSetEndpoint;
import org.apache.camel.component.hazelcast.topic.HazelcastTopicConfiguration;
import org.apache.camel.component.hazelcast.topic.HazelcastTopicEndpoint;
-import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ResourceHelper;
import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_CONFIGU_PARAM;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_CONFIGU_URI_PARAM;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_NAME_PARAM;
-import static org.apache.camel.component.hazelcast.HazelcastConstants.HAZELCAST_INSTANCE_PARAM;
-
/**
* @deprecated
*
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
index df2cb80..b7c5c26 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.hazelcast.list;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.hazelcast.HazelcastCommand;
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
index b638498..cb65207 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
@@ -20,7 +20,6 @@ import java.util.concurrent.BlockingQueue;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.hazelcast.HazelcastCommand;
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
index 3b36b42..325cbad 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.hazelcast;
-import java.util.ArrayList;
-import java.util.List;
import com.hazelcast.core.HazelcastInstance;
import org.apache.camel.CamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
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 f45cc83..1764beb 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
@@ -56,7 +56,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getCluster()).thenReturn(cluster);
argument = ArgumentCaptor.forClass(MembershipListener.class);
- when(cluster.addMembershipListener(argument.capture())).thenReturn("foo");
+ when(cluster.addMembershipListener(any())).thenReturn("foo");
}
@Override
@@ -72,6 +72,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
added.setExpectedMessageCount(1);
when(member.getSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345));
+ verify(cluster).addMembershipListener(argument.capture());
MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_ADDED, null);
argument.getValue().memberAdded(event);
assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
@@ -91,6 +92,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport {
when(member.getSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345));
+ verify(cluster).addMembershipListener(argument.capture());
MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_REMOVED, null);
argument.getValue().memberRemoved(event);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
index 71c56a0..3fc9392 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.Mockito.*;
@@ -37,14 +38,13 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
@Mock
private IList<String> list;
- private ArgumentCaptor<ItemListener> argument;
+ @Captor
+ private ArgumentCaptor<ItemListener<String>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getList("foo")).thenReturn(list);
- argument = ArgumentCaptor.forClass(ItemListener.class);
- when(list.addItemListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(list.addItemListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -55,11 +55,11 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void add() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(list).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("mm", ItemEventType.ADDED, "foo", null);
argument.getValue().itemAdded(event);
@@ -69,11 +69,11 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void remove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(list).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("mm", ItemEventType.REMOVED, "foo", null);
argument.getValue().itemRemoved(event);
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 10b254b..76b8082 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
@@ -28,6 +28,7 @@ import org.apache.camel.component.hazelcast.listener.MapEntryListener;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -40,13 +41,13 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
@Mock
private IMap<Object, Object> map;
- private ArgumentCaptor<MapEntryListener> argument;
+ @Captor
+ private ArgumentCaptor<MapEntryListener<Object, Object>> argument;
@Override
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getMap("foo")).thenReturn(map);
- argument = ArgumentCaptor.forClass(MapEntryListener.class);
- when(map.addEntryListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -56,11 +57,11 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testAdd() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.ADDED.getType(), "4711", "my-foo");
argument.getValue().entryAdded(event);
assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
@@ -69,11 +70,11 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testEnict() throws InterruptedException {
MockEndpoint out = super.getMockEndpoint("mock:evicted");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
@@ -81,11 +82,11 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testUpdate() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:updated");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.UPDATED.getType(), "4711", "my-foo");
argument.getValue().entryUpdated(event);
@@ -95,11 +96,11 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testEvict() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:evicted");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
@@ -109,11 +110,11 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testRemove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.REMOVED.getType(), "4711", "my-foo");
argument.getValue().entryRemoved(event);
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 f965be0..1654162 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
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -41,14 +42,13 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
@Mock
private MultiMap<Object, Object> map;
- private ArgumentCaptor<EntryListener> argument;
+ @Captor
+ private ArgumentCaptor<EntryListener<Object, Object>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getMultiMap("mm")).thenReturn(map);
- argument = ArgumentCaptor.forClass(EntryListener.class);
- when(map.addEntryListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -59,11 +59,11 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testAdd() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.ADDED.getType(), "4711", "my-foo");
argument.getValue().entryAdded(event);
@@ -76,11 +76,11 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
* mail from talip (hazelcast) on 21.02.2011: MultiMap doesn't support eviction yet. We can and should add this feature.
*/
@Test
- @SuppressWarnings("unchecked")
public void testEvict() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:evicted");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
@@ -88,11 +88,11 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void testRemove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.REMOVED.getType(), "4711", "my-foo");
argument.getValue().entryRemoved(event);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
index b47d34a..102cb04 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerPollTest.java
@@ -36,13 +36,11 @@ public class HazelcastQueueConsumerPollTest extends HazelcastCamelTestSupport {
private IQueue<String> queue;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getQueue("foo")).thenReturn(queue);
}
@Override
- @SuppressWarnings("unchecked")
protected void verifyHazelcastInstance(HazelcastInstance hazelcastInstance) {
verify(hazelcastInstance).getQueue("foo");
try {
@@ -53,7 +51,6 @@ public class HazelcastQueueConsumerPollTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void add() throws InterruptedException {
when(queue.poll(10000, TimeUnit.MILLISECONDS)).thenReturn("foo");
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 df76515..f015d57 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
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -40,14 +41,13 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
@Mock
private IQueue<String> queue;
- private ArgumentCaptor<ItemListener> argument;
+ @Captor
+ private ArgumentCaptor<ItemListener<String>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getQueue("foo")).thenReturn(queue);
- argument = ArgumentCaptor.forClass(ItemListener.class);
- when(queue.addItemListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(queue.addItemListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -58,11 +58,11 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void add() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(queue).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("foo", ItemEventType.ADDED, "foo", null);
argument.getValue().itemAdded(event);
@@ -73,11 +73,11 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void remove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(queue).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("foo", ItemEventType.REMOVED, "foo", null);
argument.getValue().itemRemoved(event);
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 9137e86..74462af 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
@@ -27,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -38,14 +39,13 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor
@Mock
private ITopic<String> reliableTopic;
- private ArgumentCaptor<MessageListener> argument;
+ @Captor
+ private ArgumentCaptor<MessageListener<String>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getReliableTopic("foo")).thenReturn(reliableTopic);
- argument = ArgumentCaptor.forClass(MessageListener.class);
- when(reliableTopic.addMessageListener(argument.capture())).thenReturn("foo");
+ when(reliableTopic.addMessageListener(any())).thenReturn("foo");
}
@Override
@@ -56,11 +56,11 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor
}
@Test
- @SuppressWarnings("unchecked")
public void receive() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:received");
out.expectedMessageCount(1);
+ verify(reliableTopic).addMessageListener(argument.capture());
final Message<String> msg = new Message<String>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
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 7bee934..76c7ea9 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
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -41,14 +42,13 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor
@Mock
private ReplicatedMap<Object, Object> map;
- private ArgumentCaptor<EntryListener> argument;
+ @Captor
+ private ArgumentCaptor<EntryListener<Object, Object>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.getReplicatedMap("rm")).thenReturn(map);
- argument = ArgumentCaptor.forClass(EntryListener.class);
- when(map.addEntryListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(map.addEntryListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -59,11 +59,11 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor
}
@Test
- @SuppressWarnings("unchecked")
public void testAdd() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.ADDED.getType(), "4711", "my-foo");
argument.getValue().entryAdded(event);
@@ -76,11 +76,11 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor
* mail from talip (hazelcast) on 21.02.2011: MultiMap doesn't support eviction yet. We can and should add this feature.
*/
@Test
- @SuppressWarnings("unchecked")
public void testEvict() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:evicted");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo");
argument.getValue().entryEvicted(event);
@@ -88,11 +88,11 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor
}
@Test
- @SuppressWarnings("unchecked")
public void testRemove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(map).addEntryListener(argument.capture(), eq(true));
EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.REMOVED.getType(), "4711", "my-foo");
argument.getValue().entryRemoved(event);
diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
index 3265856..c43926a 100644
--- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
+++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java
@@ -29,6 +29,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.Mockito.*;
@@ -38,14 +39,13 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
@Mock
private ISet<String> set;
- private ArgumentCaptor<ItemListener> argument;
+ @Captor
+ private ArgumentCaptor<ItemListener<String>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getSet("foo")).thenReturn(set);
- argument = ArgumentCaptor.forClass(ItemListener.class);
- when(set.addItemListener(argument.capture(), eq(true))).thenReturn("foo");
+ when(set.addItemListener(any(), eq(true))).thenReturn("foo");
}
@Override
@@ -56,11 +56,11 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void add() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
+ verify(set).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("mm", ItemEventType.ADDED, "foo", null);
argument.getValue().itemAdded(event);
@@ -70,11 +70,11 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void remove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
+ verify(set).addItemListener(argument.capture(), eq(true));
final ItemEvent<String> event = new ItemEvent<String>("mm", ItemEventType.REMOVED, "foo", null);
argument.getValue().itemRemoved(event);
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 7da2f85..d160526 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
@@ -27,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import static org.mockito.ArgumentMatchers.any;
@@ -38,14 +39,13 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport {
@Mock
private ITopic<String> topic;
- private ArgumentCaptor<MessageListener> argument;
+ @Captor
+ private ArgumentCaptor<MessageListener<String>> argument;
@Override
- @SuppressWarnings("unchecked")
protected void trainHazelcastInstance(HazelcastInstance hazelcastInstance) {
when(hazelcastInstance.<String>getTopic("foo")).thenReturn(topic);
- argument = ArgumentCaptor.forClass(MessageListener.class);
- when(topic.addMessageListener(argument.capture())).thenReturn("foo");
+ when(topic.addMessageListener(any())).thenReturn("foo");
}
@Override
@@ -56,11 +56,11 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport {
}
@Test
- @SuppressWarnings("unchecked")
public void receive() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:received");
out.expectedMessageCount(1);
+ verify(topic).addMessageListener(argument.capture());
final Message<String> msg = new Message<String>("foo", "foo", new java.util.Date().getTime(), null);
argument.getValue().onMessage(msg);
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.