Repository: camel Updated Branches: refs/heads/master 3d46babb3 -> 7b39fa9bd
CAMEL-11845: Migrate easymock and powermock to mockito Migrate camel-atmosphere-websocket 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/cbc025d5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cbc025d5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cbc025d5 Branch: refs/heads/master Commit: cbc025d508d9360c02e824d2c1cc4d219c7526ce Parents: 3d46bab Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Thu Sep 28 19:10:09 2017 +0200 Committer: Pascal Schumacher <pascalschumac...@gmx.net> Committed: Thu Sep 28 19:10:09 2017 +0200 ---------------------------------------------------------------------- components/camel-atmosphere-websocket/pom.xml | 4 ++-- .../atmosphere/websocket/MemoryWebSocketStoreTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cbc025d5/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index 21e1381..e8e14f0 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -87,8 +87,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> http://git-wip-us.apache.org/repos/asf/camel/blob/cbc025d5/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java index 398c5f4..2724307 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/MemoryWebSocketStoreTest.java @@ -19,9 +19,9 @@ package org.apache.camel.component.atmosphere.websocket; import java.util.UUID; import org.atmosphere.websocket.WebSocket; -import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; +import org.mockito.Mockito; public class MemoryWebSocketStoreTest extends Assert { @@ -29,8 +29,8 @@ public class MemoryWebSocketStoreTest extends Assert { @Test public void testAddAndRemove() throws Exception { MemoryWebSocketStore store = new MemoryWebSocketStore(); - WebSocket webSocket1 = EasyMock.createMock(WebSocket.class); - WebSocket webSocket2 = EasyMock.createMock(WebSocket.class); + WebSocket webSocket1 = Mockito.mock(WebSocket.class); + WebSocket webSocket2 = Mockito.mock(WebSocket.class); String connectionKey1 = UUID.randomUUID().toString(); String connectionKey2 = UUID.randomUUID().toString();
