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/01/11 12:31:03 UTC
[cxf] branch main updated: Update EasyMock to 5.1.0 (#1057)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 2c9be58586 Update EasyMock to 5.1.0 (#1057)
2c9be58586 is described below
commit 2c9be58586580ce1c2e9642a1fb44fa92d109c8a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 07:30:55 2023 -0500
Update EasyMock to 5.1.0 (#1057)
---
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
parent/pom.xml | 2 +-
.../cxf/transport/https/HttpsURLConnectionFactoryTest.java | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index d58f73c9c3..2b39bd5602 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -68,7 +68,7 @@ public class ConnectionFactoryImplTest {
assertTrue("Instance of Referenceable", cf instanceof Referenceable);
assertNull("No ref set", cf.getReference());
- Reference ref = EasyMock.createMock(Reference.class);
+ Reference ref = new Reference("some.class");
cf.setReference(ref);
assertEquals("Got back what was set", ref, cf.getReference());
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 84eeed1f0a..f0dfb10d13 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -55,7 +55,7 @@
<cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
<cxf.asm.version>9.4</cxf.asm.version>
- <cxf.easymock.version>5.0.1</cxf.easymock.version>
+ <cxf.easymock.version>5.1.0</cxf.easymock.version>
<!-- please maintain alphabetical order here -->
<cxf.activemq.artemis.version>2.27.1</cxf.activemq.artemis.version>
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
index ebed529b06..fa19f6c275 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/HttpsURLConnectionFactoryTest.java
@@ -26,9 +26,9 @@ import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Mockito;
public class HttpsURLConnectionFactoryTest {
@@ -44,7 +44,7 @@ public class HttpsURLConnectionFactoryTest {
TLSClientParameters tlsClientParams = new TLSClientParameters();
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -66,7 +66,7 @@ public class HttpsURLConnectionFactoryTest {
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
tlsClientParams.setCertAlias("someAlias");
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -88,7 +88,7 @@ public class HttpsURLConnectionFactoryTest {
TLSClientParameters tlsClientParams = new TLSClientParameters();
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);
@@ -111,7 +111,7 @@ public class HttpsURLConnectionFactoryTest {
tlsClientParams.setUseHttpsURLConnectionDefaultSslSocketFactory(false);
tlsClientParams.setCertAlias("someAlias");
- HttpsURLConnection conn = EasyMock.createMock(HttpsURLConnection.class);
+ HttpsURLConnection conn = Mockito.mock(HttpsURLConnection.class);
try {
factory.decorateWithTLS(tlsClientParams, conn);