You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/07/31 21:31:28 UTC
[cxf] 02/03: CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3d40d621a8212c92e4a38355f8bfe19fec2b8e85
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jul 31 15:24:28 2023 -0400
CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)
(cherry picked from commit 18772ccd06e30586122665f1f1179cb3e7361eb3)
---
rt/transports/websocket/pom.xml | 5 +++--
.../websocket/jetty/JettyWebSocketDestinationTest.java | 16 ++--------------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 58238b89ab..c7870c9e48 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -203,8 +203,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-subclass</artifactId>
+ <version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
index adb54adb5c..1e8afb00ca 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -32,14 +32,11 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.websocket.jetty10.Jetty10WebSocketDestination;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
+import static org.mockito.Mockito.mock;
/**
*
*/
@@ -47,13 +44,6 @@ public class JettyWebSocketDestinationTest {
private static final String ENDPOINT_ADDRESS = "ws://localhost:9001/websocket/nada";
private static final QName ENDPOINT_NAME = new QName("urn:websocket:probe", "nada");
- private IMocksControl control;
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- }
-
@Test
public void testRegisteration() throws Exception {
Bus bus = new ExtensionManagerBus();
@@ -61,9 +51,7 @@ public class JettyWebSocketDestinationTest {
EndpointInfo endpoint = new EndpointInfo();
endpoint.setAddress(ENDPOINT_ADDRESS);
endpoint.setName(ENDPOINT_NAME);
- JettyHTTPServerEngine engine = EasyMock.createMock(JettyHTTPServerEngine.class);
-
- control.replay();
+ JettyHTTPServerEngine engine = mock(JettyHTTPServerEngine.class);
TestJettyWebSocketDestination dest = new TestJettyWebSocketDestination(bus, registry, endpoint, null, engine);