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 01:16:36 UTC
[cxf] branch 3.5.x-fixes updated: Fixing corba / jaxws / ws-addr / ws-security tests (result of EasyMock 5.1.0 update)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new a774bef562 Fixing corba / jaxws / ws-addr / ws-security tests (result of EasyMock 5.1.0 update)
a774bef562 is described below
commit a774bef562f47b4b66e9890c5968d80c4476d8d9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jan 11 20:16:21 2023 -0500
Fixing corba / jaxws / ws-addr / ws-security tests (result of EasyMock 5.1.0 update)
---
.../org/apache/cxf/binding/corba/CorbaConduitTest.java | 18 +++++++++++++++---
.../cxf/binding/corba/CorbaServerConduitTest.java | 9 ++++++---
.../transport/http_jaxws_spi/HttpHandlerImplTest.java | 6 +++++-
.../http_jaxws_spi/JAXWSHttpSpiDestinationTest.java | 12 ++++++++++--
.../JAXWSHttpSpiTransportFactoryTest.java | 6 +++++-
.../apache/cxf/ws/addressing/soap/MAPCodecTest.java | 2 +-
.../security/wss4j/AttachmentCallbackHandlerTest.java | 9 ++++++++-
7 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index 3fc47fc013..474ef21397 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -77,6 +77,18 @@ public class CorbaConduitTest {
CorbaBindingFactory factory;
OrbConfig orbConfig;
+ // EasyMock: java.lang.IllegalAccessException when mocking org.omg.CORBA.* classes
+ private abstract static class MockRequest extends Request {
+ }
+
+ // EasyMock: java.lang.IllegalAccessException when mocking org.omg.CORBA.* classes
+ private abstract static class MockNamedValue extends NamedValue {
+ }
+
+ // EasyMock: java.lang.IllegalAccessException when mocking org.omg.CORBA.* classes
+ private abstract static class MockExceptionList extends ExceptionList {
+ }
+
@Before
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
@@ -363,10 +375,10 @@ public class CorbaConduitTest {
EasyMock.expect(message.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)).andReturn(obj);
//msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
- Request r = control.createMock(Request.class);
+ Request r = control.createMock(MockRequest.class);
NVList nvList = orb.create_list(0);
- NamedValue ret = control.createMock(NamedValue.class);
- ExceptionList exList = control.createMock(ExceptionList.class);
+ NamedValue ret = control.createMock(MockNamedValue.class);
+ ExceptionList exList = control.createMock(MockExceptionList.class);
EasyMock.expect(obj._create_request((Context)EasyMock.anyObject(),
EasyMock.eq("greetMe"),
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index cefef3352e..bcb1a216de 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -70,6 +70,9 @@ public class CorbaServerConduitTest {
CorbaTypeMap corbaTypeMap;
private org.omg.CORBA.Object targetObject;
+ // EasyMock: java.lang.IllegalAccessException when mocking org.omg.CORBA.* classes
+ private abstract static class MockServerRequest extends ServerRequest {
+ }
@Before
public void setUp() throws Exception {
@@ -203,7 +206,7 @@ public class CorbaServerConduitTest {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
- ServerRequest request = control.createMock(ServerRequest.class);
+ ServerRequest request = control.createMock(MockServerRequest.class);
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.get(ServerRequest.class)).andReturn(request);
@@ -229,7 +232,7 @@ public class CorbaServerConduitTest {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
- ServerRequest request = control.createMock(ServerRequest.class);
+ ServerRequest request = control.createMock(MockServerRequest.class);
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.get(ServerRequest.class)).andReturn(request);
@@ -276,7 +279,7 @@ public class CorbaServerConduitTest {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
- ServerRequest request = control.createMock(ServerRequest.class);
+ ServerRequest request = control.createMock(MockServerRequest.class);
EasyMock.expect(exchange.getBus()).andReturn(bus);
EasyMock.expect(msg.getExchange()).andReturn(exchange);
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
index 2c8c6b8cbc..689a538d03 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/HttpHandlerImplTest.java
@@ -36,12 +36,16 @@ public class HttpHandlerImplTest {
private JAXWSHttpSpiDestination destination;
private HttpExchange exchange;
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
+ private abstract static class MockHttpExchange extends HttpExchange {
+ }
+
@Before
public void setUp() {
control = EasyMock.createNiceControl();
destination = control.createMock(JAXWSHttpSpiDestination.class);
handler = new HttpHandlerImpl(destination);
- exchange = control.createMock(HttpExchange.class);
+ exchange = control.createMock(MockHttpExchange.class);
}
@After
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
index 01ea81197f..b029a51fcc 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java
@@ -55,6 +55,14 @@ public class JAXWSHttpSpiDestinationTest {
private MessageObserver observer;
private EndpointInfo endpoint;
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
+ private abstract static class MockHttpContext extends HttpContext {
+ }
+
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
+ private abstract static class MockHttpExchange extends HttpExchange {
+ }
+
@Before
public void setUp() {
control = EasyMock.createNiceControl();
@@ -62,7 +70,7 @@ public class JAXWSHttpSpiDestinationTest {
bus.getExtension(org.apache.cxf.policy.PolicyDataEngine.class);
EasyMock.expectLastCall().andReturn(null).anyTimes();
observer = control.createMock(MessageObserver.class);
- context = control.createMock(HttpContext.class);
+ context = control.createMock(MockHttpContext.class);
endpoint = new EndpointInfo();
endpoint.setAddress(ADDRESS);
}
@@ -104,7 +112,7 @@ public class JAXWSHttpSpiDestinationTest {
private HttpExchange setUpExchange() throws Exception {
- HttpExchange exchange = control.createMock(HttpExchange.class);
+ HttpExchange exchange = control.createMock(MockHttpExchange.class);
expect(exchange.getHttpContext()).andReturn(context).anyTimes();
expect(exchange.getQueryString()).andReturn(null);
expect(exchange.getPathInfo()).andReturn(null);
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
index e305cc759f..b0a57e9086 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiTransportFactoryTest.java
@@ -41,10 +41,14 @@ public class JAXWSHttpSpiTransportFactoryTest {
private JAXWSHttpSpiTransportFactory factory;
private Bus bus;
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
+ private abstract static class MockHttpContext extends HttpContext {
+ }
+
@Before
public void setUp() {
control = EasyMock.createNiceControl();
- context = control.createMock(HttpContext.class);
+ context = control.createMock(MockHttpContext.class);
bus = control.createMock(Bus.class);
factory = new JAXWSHttpSpiTransportFactory(context);
}
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index a2b70593d1..9e4f3f1f46 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -84,7 +84,7 @@ public class MAPCodecTest {
private String nonReplyRelationship;
private boolean expectFaultTo;
- // Mock JAXBContext
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
private abstract static class MockJAXBContext extends JAXBContext {
}
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java
index 2273dcc60f..4f379098a7 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandlerTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.activation.CommandMap;
import javax.activation.DataHandler;
+import javax.activation.DataSource;
import javax.security.auth.callback.Callback;
import org.apache.cxf.attachment.AttachmentImpl;
@@ -40,6 +41,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class AttachmentCallbackHandlerTest {
+ // EasyMock: java.lang.IllegalAccessException when mocking javax.* classes
+ private abstract static class MockDataHandler extends DataHandler {
+ MockDataHandler(DataSource ds) {
+ super(ds);
+ }
+ }
static {
WSSConfig.init();
@@ -61,7 +68,7 @@ public class AttachmentCallbackHandlerTest {
Attachment attachment = new AttachmentImpl(attachmentId);
// Mock up a DataHandler for the Attachment
- DataHandler dataHandler = EasyMock.mock(DataHandler.class);
+ DataHandler dataHandler = EasyMock.mock(MockDataHandler.class);
dataHandler.setCommandMap(anyObject(CommandMap.class));
EasyMock.expectLastCall();
EasyMock.expect(dataHandler.getInputStream()).andReturn(null);