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/11/29 17:42:13 UTC
[camel] branch master updated: CAMEL-11869: Upgrade mockito-core to
version 2.11.0 for camel-websocket
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
The following commit(s) were added to refs/heads/master by this push:
new 34bda35 CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-websocket
34bda35 is described below
commit 34bda3597f0fa890a4a65e925a6c9af453ab5d6d
Author: aldettinger <al...@gmail.com>
AuthorDate: Wed Nov 29 18:40:05 2017 +0100
CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-websocket
---
components/camel-websocket/pom.xml | 1 +
.../camel/component/websocket/DefaultWebsocketTest.java | 16 +++++-----------
.../component/websocket/MemoryWebsocketStoreTest.java | 5 +----
.../component/websocket/NodeSynchronizationImplTest.java | 11 +----------
.../websocket/WebsocketComponentServletTest.java | 5 ++---
.../component/websocket/WebsocketComponentTest.java | 13 ++++---------
.../camel/component/websocket/WebsocketConsumerTest.java | 11 ++++-------
.../websocket/WebsocketEndpointConfigurationTest.java | 7 +++++--
.../camel/component/websocket/WebsocketEndpointTest.java | 12 +++---------
.../camel/component/websocket/WebsocketProducerTest.java | 15 +--------------
10 files changed, 27 insertions(+), 69 deletions(-)
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 76b30cc..3a41832 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -103,6 +103,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
index b899c71..b7a0254 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/DefaultWebsocketTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -30,9 +30,6 @@ import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class DefaultWebsocketTest {
@@ -64,15 +61,12 @@ public class DefaultWebsocketTest {
}
@Test
- public void testOnOpen() {
+ public void testOnConnect() {
defaultWebsocket.onConnect(session);
- /*
- * keyCaptor not functional anymore, because addSocket cannot be called with connectionKey
- *
- * InOrder inOrder = inOrder(connection, consumer, sync); ArgumentCaptor<String> keyCaptor = ArgumentCaptor.forClass(String.class); inOrder.verify(sync,
- * times(1)).addSocket((eq(defaultWebsocket))); inOrder.verifyNoMoreInteractions();
- */
+ InOrder inOrder = inOrder(session, consumer, sync);
+ inOrder.verify(sync, times(1)).addSocket(defaultWebsocket);
+ inOrder.verifyNoMoreInteractions();
assertEquals(session, defaultWebsocket.getSession());
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
index 5a3b933..a99788c 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/MemoryWebsocketStoreTest.java
@@ -21,7 +21,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -30,9 +30,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class MemoryWebsocketStoreTest {
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
index 6d885cc..ad1ae62 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/NodeSynchronizationImplTest.java
@@ -20,16 +20,13 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class NodeSynchronizationImplTest {
@@ -47,9 +44,6 @@ public class NodeSynchronizationImplTest {
private MemoryWebsocketStore store1;
- /**
- * @throws Exception
- */
@Before
public void setUp() throws Exception {
@@ -60,9 +54,6 @@ public class NodeSynchronizationImplTest {
websocket2 = new DefaultWebsocket(sync, null, consumer);
websocket2.setConnectionKey(KEY_2);
-
- // when(websocket1.getConnectionKey()).thenReturn(KEY_1);
- // when(websocket2.getConnectionKey()).thenReturn(KEY_2);
}
/**
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
index b1eea55..d08c1b8 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -53,8 +53,7 @@ public class WebsocketComponentServletTest {
private WebsocketComponentServlet websocketComponentServlet;
private Map<String, WebSocketFactory> socketFactory;
-
-
+
@Before
public void setUp() throws Exception {
socketFactory = new HashMap<String, WebSocketFactory>();
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
index fc38dbf..ae10722 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -38,14 +38,11 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class WebsocketComponentTest {
@@ -72,9 +69,7 @@ public class WebsocketComponentTest {
public void setUp() throws Exception {
component = new WebsocketComponent();
component.setCamelContext(new DefaultCamelContext());
- System.out.println("Server : " + server.isStarted());
server = component.createServer();
- System.out.println("Server : " + server.isStarted());
ServerConnector connector = new ServerConnector(server);
connector.setHost("localhost");
connector.setPort(1988);
@@ -107,7 +102,7 @@ public class WebsocketComponentTest {
assertEquals("/", handler.getContextPath());
assertNull(handler.getSessionHandler());
assertNull(handler.getResourceBase());
- assertNull(handler.getServletHandler().getHolderEntry("/"));
+ assertNull(handler.getServletHandler().getMappedServlet("/"));
}
@Test
@@ -125,7 +120,7 @@ public class WebsocketComponentTest {
assertNotNull(handler.getSessionHandler());
assertNotNull(handler.getResourceBase());
assertTrue(handler.getResourceBase().startsWith(JettyClassPathResource.class.getName()));
- assertNotNull(handler.getServletHandler().getHolderEntry("/"));
+ assertNotNull(handler.getServletHandler().getMappedServlet("/"));
}
@Test
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
index f232356..38a601b 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerTest.java
@@ -25,18 +25,15 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
-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.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class WebsocketConsumerTest {
@@ -98,7 +95,7 @@ public class WebsocketConsumerTest {
inOrder.verify(outMessage, times(1)).setBody(MESSAGE);
inOrder.verify(processor, times(1)).process(exchange);
inOrder.verify(exchange, times(2)).getException();
- inOrder.verify(exceptionHandler, times(1)).handleException(any(String.class), eq(exchange), eq(exception));
+ inOrder.verify(exceptionHandler, times(1)).handleException(any(), eq(exchange), eq(exception));
inOrder.verifyNoMoreInteractions();
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
index 7e4beaf..f1ca2d2 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.websocket;
-import static org.junit.Assume.assumeTrue;
-
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.websocket.WebsocketComponent.ConnectorRef;
@@ -27,8 +25,13 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.junit.Assume.assumeTrue;
+@RunWith(MockitoJUnitRunner.class)
public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
private int port;
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
index df7252c..66ddfc2 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointTest.java
@@ -25,19 +25,16 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class WebsocketEndpointTest {
@@ -52,9 +49,6 @@ public class WebsocketEndpointTest {
private WebsocketEndpoint websocketEndpoint;
- /**
- * @throws Exception
- */
@Before
public void setUp() throws Exception {
websocketEndpoint = new WebsocketEndpoint(component, URI, REMAINING, null);
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
index e49b9b4..85aeee2 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
@@ -16,12 +16,9 @@
*/
package org.apache.camel.component.websocket;
-import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -32,7 +29,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -40,14 +37,10 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
-/**
- *
- */
@RunWith(MockitoJUnitRunner.class)
public class WebsocketProducerTest {
@@ -73,8 +66,6 @@ public class WebsocketProducerTest {
@Mock
private Future<Void> future;
- private IOException ioException = new IOException("BAD NEWS EVERYONE!");
- private ExecutionException exception = new ExecutionException("Failure", ioException);
private WebsocketProducer websocketProducer;
private Collection<DefaultWebsocket> sockets;
@@ -122,7 +113,6 @@ public class WebsocketProducerTest {
when(session.isOpen()).thenReturn(true);
when(session.getRemote()).thenReturn(remoteEndpoint);
when(remoteEndpoint.sendStringByFuture(MESSAGE)).thenReturn(future);
- doThrow(exception).when(future).get(60000, TimeUnit.MILLISECONDS);
try {
websocketProducer.process(exchange);
@@ -178,7 +168,6 @@ public class WebsocketProducerTest {
@Test
public void testProcessSingleMessageNoConnectionKey() throws Exception {
when(exchange.getIn()).thenReturn(inMessage);
- when(inMessage.getBody(String.class)).thenReturn(MESSAGE);
when(inMessage.getHeader(WebsocketConstants.SEND_TO_ALL, false, Boolean.class)).thenReturn(false);
when(inMessage.getHeader(WebsocketConstants.CONNECTION_KEY, String.class)).thenReturn(null);
@@ -219,7 +208,6 @@ public class WebsocketProducerTest {
public void testSendMessageConnetionIsClosed() throws Exception {
when(defaultWebsocket1.getSession()).thenReturn(session);
when(session.isOpen()).thenReturn(false);
- when(session.getRemote()).thenReturn(remoteEndpoint);
websocketProducer.sendMessage(defaultWebsocket1, MESSAGE);
@@ -282,7 +270,6 @@ public class WebsocketProducerTest {
when(session.getRemote()).thenReturn(remoteEndpoint);
when(session.isOpen()).thenReturn(true);
when(remoteEndpoint.sendStringByFuture(MESSAGE)).thenReturn(future);
- doThrow(exception).when(future).get(60000, TimeUnit.MILLISECONDS);
try {
websocketProducer.process(exchange);
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].