CXF-8863: Get rid of EasyMock in cxf-rt-transports-websocket (#1353)

apache · Jul 31, 2023 · 18772cc · 18772cc
1 parent 08b1c6a
commit 18772cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
@@ -183,8 +183,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/...src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java b/...src/test/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocketDestinationTest.java
@@ -32,38 +32,26 @@
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
 import org.apache.cxf.transport.websocket.jetty11.Jetty11WebSocketDestination;
 
-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;
 /**
  *
  */
 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();
         DestinationRegistry registry = new HTTPTransportFactory().getRegistry();
         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);