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
commit 7ce7ebb281c5cb9f335de28c30fdf97fac9b852c 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) (cherry picked from commit e797494f0aead82a2fa344c66023303b3c143f34) # Conflicts: # integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java --- 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 84b566b12d..e1576dd88e 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 719a181f80..b1ec57873c 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 javax.resource.spi.ConnectionRequestInfo; import javax.security.auth.Subject; -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 e60a361979..e258629b4c 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 @@ -25,13 +25,13 @@ import javax.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 { @@ -49,7 +49,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 f2976f0d87..cdb3a6ceb2 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 @@ -30,7 +30,6 @@ import javax.resource.spi.ConnectionManager; import javax.resource.spi.ManagedConnectionFactory; import javax.xml.namespace.QName; -import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -38,6 +37,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 { @@ -48,8 +50,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); @@ -74,18 +76,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("")); @@ -93,31 +91,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); @@ -126,24 +116,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); @@ -153,7 +137,6 @@ public class ConnectionFactoryImplTest { @Test public void testGetConnectionWithNoWsdlLocationAndNoPortReturnsConnectionWithRightManager() throws Exception { - EasyMock.reset(mockConnectionManager); CXFConnectionRequestInfo reqInfo = new CXFConnectionRequestInfo(Runnable.class, @@ -161,10 +144,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 f3a476699f..dc36359c42 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 @@ -29,13 +29,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 { @@ -67,7 +67,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"); @@ -85,7 +85,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 d2509de551..fc62067851 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 @@ -37,7 +37,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; @@ -47,7 +46,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 { @@ -172,14 +172,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); @@ -231,7 +227,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 9f86bb1103..aafdcede8a 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 @@ -35,13 +35,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 { @@ -148,11 +151,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)); } @@ -195,7 +196,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 ce28f0d0fe..35b06b8694 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 19377de61e..6a588843a3 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 @@ -34,7 +34,6 @@ import javax.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; @@ -43,7 +42,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 { @@ -111,7 +112,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)); @@ -133,7 +134,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); @@ -156,13 +157,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);
