[cxf] branch 3.6.x-fixes updated: CXF-8917: Get rid of EasyMock in cxf-rt-transports-http-hc (#1391)

[reta]

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


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new ca3f4f93a1 CXF-8917: Get rid of EasyMock in cxf-rt-transports-http-hc 
(#1391)
ca3f4f93a1 is described below

commit ca3f4f93a1d99ec79d3b7faab84f1f143347bd01
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sat Aug 19 11:02:48 2023 -0400

    CXF-8917: Get rid of EasyMock in cxf-rt-transports-http-hc (#1391)
---
 rt/transports/http-hc/pom.xml                                        | 5 +++--
 .../org/apache/cxf/transport/http/asyncclient/ActivatorTest.java     | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml
index 08ee44844a..a9afb6f813 100644
--- a/rt/transports/http-hc/pom.xml
+++ b/rt/transports/http-hc/pom.xml
@@ -45,8 +45,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${cxf.mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/ActivatorTest.java
 
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/ActivatorTest.java
index f312360bfa..16f1c9cd87 100644
--- 
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/ActivatorTest.java
+++ 
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/ActivatorTest.java
@@ -26,10 +26,9 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.osgi.framework.BundleContext;
 
-import org.easymock.EasyMock;
 import org.junit.Test;
 
-import static org.easymock.EasyMock.mock;
+import static org.mockito.Mockito.mock;
 
 public class ActivatorTest {
 
@@ -49,11 +48,9 @@ public class ActivatorTest {
         //Dummy service properties that are expected to be passed to 
conduitFactory
         final Map<String, Object> properties = Collections.singletonMap("foo", 
"bar");
         conduitFactory.update(properties);
-        EasyMock.replay(conduitFactory);
 
         //act and verify
         configurer.updated(new Hashtable<>(properties));
-        EasyMock.verify(conduitFactory);
     }
 
 }