You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/10/03 07:29:53 UTC
[2/3] camel git commit: CAMEL-11845: Migrate easymock and powermock
to mockito
CAMEL-11845: Migrate easymock and powermock to mockito
Migrate camel-cxf-transport from easymock to mockito.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/195bb5b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/195bb5b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/195bb5b1
Branch: refs/heads/master
Commit: 195bb5b1dbb68be09b8e66acd8d42cb3a1e6c261
Parents: 68d7912
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Fri Sep 29 17:47:57 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Oct 3 09:27:35 2017 +0200
----------------------------------------------------------------------
components/camel-cxf-transport/pom.xml | 4 +-
.../message/DefaultCxfMessageMapperTest.java | 78 +++++++-------------
.../cxf/transport/CamelDestinationTest.java | 14 ++--
.../transport/CamelTransportTestSupport.java | 4 +-
4 files changed, 39 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/195bb5b1/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 193387f..cfe6dcf 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -149,8 +149,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/195bb5b1/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index e136e4b..ac62416 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -29,10 +29,12 @@ import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.security.SecurityContext;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class DefaultCxfMessageMapperTest extends Assert {
@Test
@@ -44,7 +46,7 @@ public class DefaultCxfMessageMapperTest extends Assert {
Exchange camelExchange = setupCamelExchange(requestURI, requestPath, null);
Message cxfMessage = mapper.createCxfMessageFromCamelExchange(
- camelExchange, EasyMock.createMock(HeaderFilterStrategy.class));
+ camelExchange, mock(HeaderFilterStrategy.class));
assertEquals(requestURI, cxfMessage.get(Message.REQUEST_URI).toString());
assertEquals(requestPath, cxfMessage.get(Message.BASE_PATH).toString());
@@ -54,18 +56,14 @@ public class DefaultCxfMessageMapperTest extends Assert {
public void testSecurityContext() {
DefaultCxfMessageMapper mapper = new DefaultCxfMessageMapper();
- HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
- request.getUserPrincipal();
- EasyMock.expectLastCall().andReturn(new SimplePrincipal("barry"));
- request.isUserInRole("role1");
- EasyMock.expectLastCall().andReturn(true);
- request.isUserInRole("role2");
- EasyMock.expectLastCall().andReturn(false);
- EasyMock.replay(request);
+ HttpServletRequest request = mock(HttpServletRequest.class);
+ when(request.getUserPrincipal()).thenReturn(new SimplePrincipal("barry"));
+ when(request.isUserInRole("role1")).thenReturn(true);
+ when(request.isUserInRole("role2")).thenReturn(false);
Exchange camelExchange = setupCamelExchange("/", "/", request);
Message cxfMessage = mapper.createCxfMessageFromCamelExchange(
- camelExchange, EasyMock.createMock(HeaderFilterStrategy.class));
+ camelExchange, mock(HeaderFilterStrategy.class));
SecurityContext sc = cxfMessage.get(SecurityContext.class);
assertNotNull(sc);
assertEquals("barry", sc.getUserPrincipal().getName());
@@ -74,45 +72,25 @@ public class DefaultCxfMessageMapperTest extends Assert {
}
private Exchange setupCamelExchange(String requestURI, String requestPath, HttpServletRequest request) {
- org.apache.camel.Message camelMessage = EasyMock
- .createMock(org.apache.camel.Message.class);
- Exchange camelExchange = EasyMock.createMock(Exchange.class);
- camelExchange.getProperty(CamelTransportConstants.CXF_EXCHANGE,
- org.apache.cxf.message.Exchange.class);
- EasyMock.expectLastCall().andReturn(new ExchangeImpl());
- camelExchange.hasOut();
- EasyMock.expectLastCall().andReturn(false);
- camelExchange.getIn();
- EasyMock.expectLastCall().andReturn(camelMessage).times(3);
- camelMessage.getHeaders();
- EasyMock.expectLastCall().andReturn(Collections.emptyMap()).times(2);
- camelMessage.getHeader(Exchange.CONTENT_TYPE, String.class);
- EasyMock.expectLastCall().andReturn(null);
- camelMessage.getHeader("Accept", String.class);
- EasyMock.expectLastCall().andReturn(null);
- camelMessage.getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class);
- EasyMock.expectLastCall().andReturn(null);
- camelMessage.getHeader(Exchange.CHARSET_NAME, String.class);
- EasyMock.expectLastCall().andReturn(null);
- camelMessage.getHeader(Exchange.HTTP_URI, String.class);
- EasyMock.expectLastCall().andReturn(requestURI);
- camelMessage.getHeader(Exchange.HTTP_PATH, String.class);
- EasyMock.expectLastCall().andReturn(requestPath);
- camelMessage.getHeader(Exchange.HTTP_BASE_URI, String.class);
- EasyMock.expectLastCall().andReturn(requestPath);
- camelMessage.getHeader(Exchange.HTTP_METHOD, String.class);
- EasyMock.expectLastCall().andReturn("GET");
- camelMessage.getHeader(Exchange.HTTP_QUERY, String.class);
- EasyMock.expectLastCall().andReturn("");
- camelMessage.getHeader(Exchange.HTTP_SERVLET_REQUEST);
- EasyMock.expectLastCall().andReturn(request);
- camelMessage.getHeader(Exchange.HTTP_SERVLET_RESPONSE);
- EasyMock.expectLastCall().andReturn(null);
-
- camelMessage.getBody(InputStream.class);
- EasyMock.expectLastCall().andReturn(
- new ByteArrayInputStream("".getBytes()));
- EasyMock.replay(camelExchange, camelMessage);
+ org.apache.camel.Message camelMessage = mock(org.apache.camel.Message.class);
+ Exchange camelExchange = mock(Exchange.class);
+ when(camelExchange.getProperty(CamelTransportConstants.CXF_EXCHANGE,
+ org.apache.cxf.message.Exchange.class)).thenReturn(new ExchangeImpl());
+ when(camelExchange.hasOut()).thenReturn(false);
+ when(camelExchange.getIn()).thenReturn(camelMessage);
+ when(camelMessage.getHeaders()).thenReturn(Collections.emptyMap());
+ when(camelMessage.getHeader(Exchange.CONTENT_TYPE, String.class)).thenReturn(null);
+ when(camelMessage.getHeader("Accept", String.class)).thenReturn(null);
+ when(camelMessage.getHeader(Exchange.HTTP_CHARACTER_ENCODING, String.class)).thenReturn(null);
+ when(camelMessage.getHeader(Exchange.CHARSET_NAME, String.class)).thenReturn(null);
+ when(camelMessage.getHeader(Exchange.HTTP_URI, String.class)).thenReturn(requestURI);
+ when(camelMessage.getHeader(Exchange.HTTP_PATH, String.class)).thenReturn(requestPath);
+ when(camelMessage.getHeader(Exchange.HTTP_BASE_URI, String.class)).thenReturn(requestPath);
+ when(camelMessage.getHeader(Exchange.HTTP_METHOD, String.class)).thenReturn("GET");
+ when(camelMessage.getHeader(Exchange.HTTP_QUERY, String.class)).thenReturn("");
+ when(camelMessage.getHeader(Exchange.HTTP_SERVLET_REQUEST)).thenReturn(request);
+ when(camelMessage.getHeader(Exchange.HTTP_SERVLET_RESPONSE)).thenReturn(null);
+ when(camelMessage.getBody(InputStream.class)).thenReturn(new ByteArrayInputStream("".getBytes()));
return camelExchange;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/195bb5b1/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
index 7adcbcd..0c4f0b1 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
@@ -47,9 +47,12 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.MessageObserver;
-import org.easymock.EasyMock;
import org.junit.Test;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.isA;
+import static org.mockito.Mockito.mock;
+
public class CamelDestinationTest extends CamelTransportTestSupport {
private Message destMessage;
@@ -89,7 +92,7 @@ public class CamelDestinationTest extends CamelTransportTestSupport {
}
public CamelDestination setupCamelDestination(EndpointInfo endpointInfo, boolean send) throws IOException {
- ConduitInitiator conduitInitiator = EasyMock.createMock(ConduitInitiator.class);
+ ConduitInitiator conduitInitiator = mock(ConduitInitiator.class);
CamelDestination camelDestination = new CamelDestination(context, bus, conduitInitiator, endpointInfo);
if (send) {
// setMessageObserver
@@ -258,10 +261,8 @@ public class CamelDestinationTest extends CamelTransportTestSupport {
final RuntimeException expectedException = new RuntimeException("We simulate an exception in CXF processing");
DefaultCamelContext camelContext = new DefaultCamelContext();
- CamelDestination dest = EasyMock.createMock(CamelDestination.class);
- dest.incoming(EasyMock.isA(org.apache.camel.Exchange.class));
- EasyMock.expectLastCall().andThrow(expectedException);
- EasyMock.replay(dest);
+ CamelDestination dest = mock(CamelDestination.class);
+ doThrow(expectedException).when(dest).incoming(isA(org.apache.camel.Exchange.class));
ConsumerProcessor consumerProcessor = dest.new ConsumerProcessor();
// Send our dummy exchange and check that the exception that occurred on incoming is set
@@ -270,7 +271,6 @@ public class CamelDestinationTest extends CamelTransportTestSupport {
Exception exc = exchange.getException();
assertNotNull(exc);
assertEquals(expectedException, exc);
- EasyMock.verify(dest);
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/195bb5b1/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
index f38544c..381b273 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
@@ -31,9 +31,9 @@ import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
+import org.mockito.Mockito;
public abstract class CamelTransportTestSupport extends CamelTestSupport {
@@ -70,7 +70,7 @@ public abstract class CamelTransportTestSupport extends CamelTestSupport {
if (decoupled) {
// setup the reference type
} else {
- target = EasyMock.createMock(EndpointReferenceType.class);
+ target = Mockito.mock(EndpointReferenceType.class);
}
CamelConduit camelConduit = new CamelConduit(context, bus, endpointInfo, target);