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/12 12:55:24 UTC
[cxf] 02/05: 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 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit a9ddb9c06fabdd2d11e2e865b15c9a5f3357fd11
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 07:30:55 2023 -0500
Update EasyMock to 5.1.0 (#1057)
(cherry picked from commit 2c9be58586580ce1c2e9642a1fb44fa92d109c8a)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 18ed52c0aaddb702d2bd0761f9bcee084677ff70)
(cherry picked from commit 8e3239d358b6565c382dcba2bf5bbd8ff6b3547d)
---
.../java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +-
.../cxf/transport/https/HttpsURLConnectionFactoryTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 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 f48c8a91c6..f2976f0d87 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
@@ -67,7 +67,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/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);