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 e797494f0a CXF-8843: Get rid of EasyMock in cxf-integration-jca (#1372)
e797494f0a is described below
commit e797494f0aead82a2fa344c66023303b3c143f34
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Aug 17 20:44:43 2023 -0400
CXF-8843: Get rid of EasyMock in cxf-integration-jca (#1372)
---
integration/jca/pom.xml | 5 +-
.../resourceadapter/ManagedConnectionImplTest.java | 64 +++++++++-------------
...AssociatedManagedConnectionFactoryImplTest.java | 4 +-
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 45 +++++----------
.../org/apache/cxf/jca/cxf/JCABusFactoryTest.java | 6 +-
.../jca/cxf/ManagedConnectionFactoryImplTest.java | 14 ++---
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 13 +++--
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 14 ++---
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 17 +++---
.../cxf/jca/cxf/handlers/HandlerTestBase.java | 24 +++-----
.../jca/outbound/ManagedConnectionImplTest.java | 9 +--
11 files changed, 84 insertions(+), 131 deletions(-)
diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml
index ad66a5f8f1..76b184509a 100644
--- a/integration/jca/pom.xml
+++ b/integration/jca/pom.xml
@@ -46,8 +46,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/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index 74040d7d26..c47fc4b237 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -28,13 +28,16 @@ import jakarta.resource.spi.ConnectionEvent;
import jakarta.resource.spi.ConnectionEventListener;
import jakarta.resource.spi.ConnectionRequestInfo;
-import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class ManagedConnectionImplTest {
private DummyManagedConnectionImpl mc;
@@ -70,17 +73,13 @@ public class ManagedConnectionImplTest {
public void testRemoveConnectionEventListener() throws Exception {
ConnectionEvent event = new ConnectionEvent(mc,
ConnectionEvent.CONNECTION_ERROR_OCCURRED);
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
- listener.connectionErrorOccurred(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
mc.sendEvent(event);
- EasyMock.verify(listener);
+ verify(listener,
times(1)).connectionErrorOccurred(isA(ConnectionEvent.class));
mc.removeConnectionEventListener(listener);
mc.sendEvent(event);
-
}
@Test
@@ -112,72 +111,63 @@ public class ManagedConnectionImplTest {
@Test
public void testClose() throws Exception {
final Object o = new Object();
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
- listener.connectionClosed(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
+
mc.addConnectionEventListener(listener);
mc.close(o);
- EasyMock.verify(listener);
+
+ verify(listener,
times(1)).connectionClosed(isA(ConnectionEvent.class));
}
@Test
public void testError() throws Exception {
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
- listener.connectionErrorOccurred(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+
mc.setLogWriter(null);
mc.error(new Exception());
- EasyMock.verify(listener);
+
+ verify(listener,
times(1)).connectionErrorOccurred(isA(ConnectionEvent.class));
}
@Test
public void testSendEventError() throws Exception {
ConnectionEvent event = new ConnectionEvent(mc,
ConnectionEvent.CONNECTION_ERROR_OCCURRED);
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
- listener.connectionErrorOccurred(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
mc.sendEvent(event);
- EasyMock.verify(listener);
+
+ verify(listener,
times(1)).connectionErrorOccurred(isA(ConnectionEvent.class));
}
@Test
public void testSendEventTxStarted() throws Exception {
ConnectionEvent event = new ConnectionEvent(mc,
ConnectionEvent.LOCAL_TRANSACTION_STARTED);
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
- listener.localTransactionStarted(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+
mc.sendEvent(event);
- EasyMock.verify(listener);
+ verify(listener,
times(1)).localTransactionStarted(isA(ConnectionEvent.class));
}
@Test
public void testSendEventTxCommitted() throws Exception {
ConnectionEvent event = new ConnectionEvent(mc,
ConnectionEvent.LOCAL_TRANSACTION_COMMITTED);
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
-
listener.localTransactionCommitted(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+
mc.sendEvent(event);
- EasyMock.verify(listener);
+ verify(listener,
times(1)).localTransactionCommitted(isA(ConnectionEvent.class));
}
@Test
public void testSendEventTxRolledBack() throws Exception {
ConnectionEvent event = new ConnectionEvent(mc,
ConnectionEvent.LOCAL_TRANSACTION_ROLLEDBACK);
- ConnectionEventListener listener =
EasyMock.createMock(ConnectionEventListener.class);
+ ConnectionEventListener listener = mock(ConnectionEventListener.class);
mc.addConnectionEventListener(listener);
- EasyMock.reset(listener);
-
listener.localTransactionRolledback(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+
mc.sendEvent(event);
+
+ verify(listener,
times(1)).localTransactionRolledback(isA(ConnectionEvent.class));
}
}
\ No newline at end of file
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index ecda4bd761..e0f6077941 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -24,13 +24,13 @@ import jakarta.resource.ResourceException;
import jakarta.resource.spi.ResourceAdapter;
import org.apache.cxf.Bus;
-import org.easymock.EasyMock;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
public class AssociatedManagedConnectionFactoryImplTest {
@@ -48,7 +48,7 @@ public class AssociatedManagedConnectionFactoryImplTest {
public void testSetWrongResourceAdapterThrowException() throws Exception {
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
- ResourceAdapter rai = EasyMock.createMock(ResourceAdapter.class);
+ ResourceAdapter rai = mock(ResourceAdapter.class);
try {
mci.setResourceAdapter(rai);
fail("exception expected");
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 2b39bd5602..a6b78e8965 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
@@ -31,7 +31,6 @@ import jakarta.resource.ResourceException;
import jakarta.resource.spi.ConnectionManager;
import jakarta.resource.spi.ManagedConnectionFactory;
-import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -39,6 +38,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class ConnectionFactoryImplTest {
@@ -49,8 +51,8 @@ public class ConnectionFactoryImplTest {
@Before
public void setUp() throws Exception {
- mockConnectionFactory =
EasyMock.createMock(ManagedConnectionFactory.class);
- mockConnectionManager = EasyMock.createMock(ConnectionManager.class);
+ mockConnectionFactory = mock(ManagedConnectionFactory.class);
+ mockConnectionManager = mock(ConnectionManager.class);
param = new CXFConnectionRequestInfo();
param.setInterface(Runnable.class);
@@ -75,18 +77,14 @@ public class ConnectionFactoryImplTest {
@Test
public void testGetConnectionReturnsConnectionWithRightManager() throws
Exception {
- EasyMock.reset(mockConnectionManager);
-
CXFConnectionRequestInfo reqInfo =
new CXFConnectionRequestInfo(Runnable.class,
new URL("file:/tmp/foo"),
new QName(""),
new QName(""));
-
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
- EasyMock.eq(reqInfo));
- EasyMock.expectLastCall().andReturn(null);
- EasyMock.replay(mockConnectionManager);
+
when(mockConnectionManager.allocateConnection(eq(mockConnectionFactory),
+
eq(reqInfo))).thenReturn(null);
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
@@ -94,31 +92,23 @@ public class ConnectionFactoryImplTest {
Object o = cf.getConnection(param);
assertNull("Got the result (the passed in ConnectionRequestInfo) from
out mock manager",
o);
- EasyMock.verify(mockConnectionManager);
}
@Test
public void testGetConnectionWithNoPortReturnsConnectionWithRightManager()
throws Exception {
-
- EasyMock.reset(mockConnectionManager);
-
CXFConnectionRequestInfo reqInfo =
new CXFConnectionRequestInfo(Runnable.class,
new URL("file:/tmp/foo"),
new QName(""),
null);
-
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
- EasyMock.eq(reqInfo));
- EasyMock.expectLastCall().andReturn(null);
- EasyMock.replay(mockConnectionManager);
+
when(mockConnectionManager.allocateConnection(eq(mockConnectionFactory),
+
eq(reqInfo))).thenReturn(null);
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
Object o = cf.getConnection(param);
- EasyMock.verify(mockConnectionManager);
-
assertNull("Got the result (the passed in ConnectionRequestInfo) from
out mock manager",
o);
@@ -127,24 +117,18 @@ public class ConnectionFactoryImplTest {
@Test
public void
testGetConnectionWithNoWsdlLocationReturnsConnectionWithRightManager() throws
Exception {
-
- EasyMock.reset(mockConnectionManager);
-
CXFConnectionRequestInfo reqInfo =
new CXFConnectionRequestInfo(Runnable.class,
null,
new QName(""),
new QName(""));
-
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
- EasyMock.eq(reqInfo));
- EasyMock.expectLastCall().andReturn(null);
- EasyMock.replay(mockConnectionManager);
+
when(mockConnectionManager.allocateConnection(eq(mockConnectionFactory),
+
eq(reqInfo))).thenReturn(null);
param.setServiceName(new QName(""));
param.setPortName(new QName(""));
Object o = cf.getConnection(param);
- EasyMock.verify(mockConnectionManager);
assertNull("Got the result (the passed in ConnectionRequestInfo) from
out mock manager",
o);
@@ -154,7 +138,6 @@ public class ConnectionFactoryImplTest {
@Test
public void
testGetConnectionWithNoWsdlLocationAndNoPortReturnsConnectionWithRightManager()
throws Exception {
- EasyMock.reset(mockConnectionManager);
CXFConnectionRequestInfo reqInfo =
new CXFConnectionRequestInfo(Runnable.class,
@@ -162,10 +145,8 @@ public class ConnectionFactoryImplTest {
new QName(""),
null);
-
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
- EasyMock.eq(reqInfo));
- EasyMock.expectLastCall().andReturn(null);
- EasyMock.replay(mockConnectionManager);
+
when(mockConnectionManager.allocateConnection(eq(mockConnectionFactory),
+
eq(reqInfo))).thenReturn(null);
cf = new ConnectionFactoryImpl(mockConnectionFactory,
mockConnectionManager);
param.setServiceName(new QName(""));
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index 268be3afb7..b726943741 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -28,13 +28,13 @@ import org.apache.cxf.Bus;
import
org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
import org.apache.cxf.test.AbstractCXFTest;
-import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
public class JCABusFactoryTest extends AbstractCXFTest {
@@ -66,7 +66,7 @@ public class JCABusFactoryTest extends AbstractCXFTest {
mcf.setMonitorEJBServiceProperties(Boolean.TRUE);
JCABusFactory jcaBusFactory = new JCABusFactory(mcf);
try {
- Bus mockBus = EasyMock.createMock(Bus.class);
+ Bus mockBus = mock(Bus.class);
jcaBusFactory.setBus(mockBus);
jcaBusFactory.initializeServants();
fail("exception expected");
@@ -84,7 +84,7 @@ public class JCABusFactoryTest extends AbstractCXFTest {
URL propFile =
getClass().getResource("resources/ejb_servants.properties");
mcf.setEJBServicePropertiesURL(propFile.toString());
JCABusFactory jcaBusFactory = new JCABusFactory(mcf);
- Bus mockBus = EasyMock.createMock(Bus.class);
+ Bus mockBus = mock(Bus.class);
jcaBusFactory.setBus(mockBus);
jcaBusFactory.initializeServants();
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 13d7794416..d80a85b6c7 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -36,7 +36,6 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +45,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class ManagedConnectionFactoryImplTest {
@@ -171,14 +171,10 @@ public class ManagedConnectionFactoryImplTest {
BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
BusFactory.setDefaultBus(bus);
- ManagedConnectionFactoryImpl factory =
EasyMock.createMock(ManagedConnectionFactoryImpl.class);
- factory.getBus();
+ ManagedConnectionFactoryImpl factory =
mock(ManagedConnectionFactoryImpl.class);
+ when(factory.getBus()).thenReturn(bus);
// In ManagedConnectionImpl:
// one for getCXFServiceFromBus , another for createInvocationHandler
- EasyMock.expectLastCall().andReturn(bus).times(4);
-
- EasyMock.replay(factory);
-
ManagedConnectionImpl mc1 = new ManagedConnectionImpl(factory, cri,
subj);
Object connection = mc1.getConnection(subj, cri);
@@ -230,7 +226,7 @@ public class ManagedConnectionFactoryImplTest {
@Test
public void testCreateConnectionFactoryCM() throws Exception {
ManagedConnectionFactoryImplTester mcit = new
ManagedConnectionFactoryImplTester();
- ConnectionManager connManager =
EasyMock.createMock(ConnectionManager.class);
+ ConnectionManager connManager = mock(ConnectionManager.class);
assertTrue("We get a CF back",
mcit.createConnectionFactory(connManager) instanceof
CXFConnectionFactory);
assertEquals("init was called once", 1, mcit.initCalledCount);
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index d560c391a2..176075b5a3 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -34,13 +34,16 @@ import org.apache.cxf.connector.Connection;
import org.apache.cxf.jca.cxf.handlers.ProxyInvocationHandler;
import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.EasyMock;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
@@ -147,11 +150,9 @@ public class ManagedConnectionImplTest extends
ManagedConnectionTestBase {
@Test
public void testCloseConnection() throws Exception {
Connection conn = (Connection)mci.getConnection(subj, cri);
- EasyMock.reset(mockListener);
- mockListener.connectionClosed(EasyMock.isA(ConnectionEvent.class));
- EasyMock.expectLastCall();
- EasyMock.replay(mockListener);
conn.close();
+
+ verify(mockListener,
times(1)).connectionClosed(isA(ConnectionEvent.class));
}
@@ -194,7 +195,7 @@ public class ManagedConnectionImplTest extends
ManagedConnectionTestBase {
@Test
public void testAssociateConnectionThrowsException() throws Throwable {
- InvocationHandler ih = EasyMock.createMock(InvocationHandler.class);
+ InvocationHandler ih = mock(InvocationHandler.class);
Object dodgyHandle =
Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class},
ih);
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 0deaa06e44..23fef681db 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -31,9 +31,10 @@ import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.EasyMock;
import org.junit.Before;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public abstract class ManagedConnectionTestBase {
protected Subject subj;
@@ -44,11 +45,11 @@ public abstract class ManagedConnectionTestBase {
protected ManagedConnectionImpl mci;
- protected ManagedConnectionFactoryImpl factory =
EasyMock.createMock(ManagedConnectionFactoryImpl.class);
+ protected ManagedConnectionFactoryImpl factory =
mock(ManagedConnectionFactoryImpl.class);
protected Bus bus;
- protected ConnectionEventListener mockListener =
EasyMock.createMock(ConnectionEventListener.class);
+ protected ConnectionEventListener mockListener =
mock(ConnectionEventListener.class);
public ManagedConnectionTestBase() {
@@ -78,12 +79,7 @@ public abstract class ManagedConnectionTestBase {
BusFactory.setDefaultBus(bus);
- EasyMock.reset(factory);
-
- factory.getBus();
-
- EasyMock.expectLastCall().andReturn(bus).anyTimes();
- EasyMock.replay(factory);
+ when(factory.getBus()).thenReturn(bus);
mci = new ManagedConnectionImpl(factory, cri, subj);
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 060dcd19b3..96e47b8d5d 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -32,7 +32,6 @@ import jakarta.resource.spi.ResourceAdapter;
import org.apache.cxf.Bus;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
-import org.easymock.EasyMock;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -41,7 +40,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class ResourceAdapterImplTest {
@@ -109,7 +110,7 @@ public class ResourceAdapterImplTest {
@Test
public void testRegisterBusNotNull() throws Exception {
ResourceAdapterImpl rai = new ResourceAdapterImpl();
- Bus bus = EasyMock.createMock(Bus.class);
+ Bus bus = mock(Bus.class);
rai.registerBus(bus);
assertNotNull("bus cache is not null", rai.getBusCache());
assertTrue("bus registered", rai.getBusCache().contains(bus));
@@ -131,7 +132,7 @@ public class ResourceAdapterImplTest {
@Test
public void testGetCorrectBootstrapContext() throws Exception {
ResourceAdapterImpl rai = new ResourceAdapterImpl();
- BootstrapContext bc = EasyMock.createMock(BootstrapContext.class);
+ BootstrapContext bc = mock(BootstrapContext.class);
assertNotNull("BootstrapContext not null", bc);
rai.start(bc);
assertEquals("BootstrapContext set", rai.getBootstrapContext(), bc);
@@ -154,13 +155,11 @@ public class ResourceAdapterImplTest {
public void testStopWithNonEmptyBusCache() throws Exception {
ResourceAdapterImpl rai = new ResourceAdapterImpl();
rai.setBusCache(new HashSet<>());
- Bus bus = EasyMock.createMock(Bus.class);
- bus.shutdown(true);
- EasyMock.expectLastCall();
- EasyMock.replay(bus);
+ Bus bus = mock(Bus.class);
+
rai.registerBus(bus);
rai.stop();
- EasyMock.verify(bus);
+ verify(bus, times(1)).shutdown(true);
}
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index fc2a773a57..e2f175db0f 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -26,24 +26,25 @@ import org.apache.cxf.jca.cxf.CXFManagedConnection;
import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
import org.apache.cxf.jca.cxf.ManagedConnectionImpl;
-import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class HandlerTestBase {
- protected Bus mockBus = EasyMock.createMock(Bus.class);
+ protected Bus mockBus = mock(Bus.class);
protected CXFManagedConnection mockManagedConnection =
- EasyMock.createMock(CXFManagedConnection.class);
+ mock(CXFManagedConnection.class);
protected CXFInvocationHandler mockHandler =
- EasyMock.createMock(CXFInvocationHandler.class);
+ mock(CXFInvocationHandler.class);
protected ManagedConnectionFactoryImpl mcf =
- EasyMock.createMock(ManagedConnectionFactoryImpl.class);
+ mock(ManagedConnectionFactoryImpl.class);
protected ManagedConnectionImpl mci =
- EasyMock.createMock(ManagedConnectionImpl.class);
+ mock(ManagedConnectionImpl.class);
protected Method testMethod;
protected TestTarget target = new TestTarget();
@@ -53,16 +54,9 @@ public class HandlerTestBase {
@Before
public void setUp() {
- EasyMock.reset(mcf);
- EasyMock.reset(mci);
+ when(mcf.getBus()).thenReturn(mockBus);
+ when(mci.getManagedConnectionFactory()).thenReturn(mcf);
- mcf.getBus();
- EasyMock.expectLastCall().andReturn(mockBus);
- EasyMock.replay(mcf);
-
- mci.getManagedConnectionFactory();
- EasyMock.expectLastCall().andReturn(mcf);
- EasyMock.replay(mci);
try {
testMethod = TestTarget.class.getMethod("testMethod", new
Class[0]);
} catch (NoSuchMethodException ex) {
diff --git
a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
index c03cce2e3a..3dd6e43e8a 100644
---
a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
+++
b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
@@ -24,12 +24,11 @@ import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
import org.apache.hello_world_soap_http.Greeter;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.mock;
/**
* Unit test for ManagedConnectionImpl
@@ -43,9 +42,7 @@ public class ManagedConnectionImplTest {
public void testHandleEqualsMethod() throws Exception {
BusFactory.setDefaultBus(null);
- IMocksControl control = EasyMock.createNiceControl();
-
- ManagedConnectionFactoryImpl mcf =
control.createMock(ManagedConnectionFactoryImpl.class);
+ ManagedConnectionFactoryImpl mcf =
mock(ManagedConnectionFactoryImpl.class);
CXFConnectionSpec cxRequestInfo = new CXFConnectionSpec();
@@ -54,8 +51,6 @@ public class ManagedConnectionImplTest {
cxRequestInfo.setEndpointName(new
QName("http://apache.org/hello_world_soap_http";, "SoapPort"));
cxRequestInfo.setServiceName(new
QName("http://apache.org/hello_world_soap_http";, "SOAPService"));
- control.replay();
-
Subject subject = new Subject();
ManagedConnectionImpl conn = new ManagedConnectionImpl(mcf,
cxRequestInfo, subject);
