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 29bc5661b0c09e45d2ff72bf29d53c2a6c376fc3 Author: Andriy Redko <[email protected]> AuthorDate: Mon Aug 28 20:36:56 2023 -0400 CXF-8868: Get rid of EasyMock in cxf-rt-rs-extension-providers (#1393) (cherry picked from commit 86c2942b50074ec2dff63ec024c12c2756e36580) --- rt/rs/extensions/providers/pom.xml | 5 +-- .../jaxrs/provider/dom4j/DOM4JProviderTest.java | 40 ++++++++-------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index dcaf796bc8..3d19bd5a8b 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -130,8 +130,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/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java index b58598f275..3cdce35ba7 100644 --- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java +++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProviderTest.java @@ -41,12 +41,13 @@ import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; -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.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class DOM4JProviderTest { @@ -215,18 +216,13 @@ public class DOM4JProviderTest { e.put(DOM4JProvider.SUPPRESS_XML_DECLARATION, suppress); m.setExchange(e); e.setInMessage(m); - Endpoint endpoint = EasyMock.createMock(Endpoint.class); - endpoint.getEndpointInfo(); - EasyMock.expectLastCall().andReturn(null).anyTimes(); - endpoint.get(Application.class.getName()); - EasyMock.expectLastCall().andReturn(null); - endpoint.size(); - EasyMock.expectLastCall().andReturn(0).anyTimes(); - endpoint.isEmpty(); - EasyMock.expectLastCall().andReturn(true).anyTimes(); - endpoint.get(ServerProviderFactory.class.getName()); - EasyMock.expectLastCall().andReturn(factory).anyTimes(); - EasyMock.replay(endpoint); + Endpoint endpoint = mock(Endpoint.class); + when(endpoint.getEndpointInfo()).thenReturn(null); + when(endpoint.get(Application.class.getName())).thenReturn(null); + when(endpoint.size()).thenReturn(0); + when(endpoint.isEmpty()).thenReturn(true); + when(endpoint.get(ServerProviderFactory.class.getName())).thenReturn(factory); + e.put(Endpoint.class, endpoint); return m; } @@ -245,18 +241,12 @@ public class DOM4JProviderTest { Exchange e = new ExchangeImpl(); m.setExchange(e); e.setInMessage(m); - Endpoint endpoint = EasyMock.createMock(Endpoint.class); - endpoint.getEndpointInfo(); - EasyMock.expectLastCall().andReturn(null).anyTimes(); - endpoint.get(Application.class.getName()); - EasyMock.expectLastCall().andReturn(null); - endpoint.size(); - EasyMock.expectLastCall().andReturn(0).anyTimes(); - endpoint.isEmpty(); - EasyMock.expectLastCall().andReturn(true).anyTimes(); - endpoint.get(ServerProviderFactory.class.getName()); - EasyMock.expectLastCall().andReturn(factory).anyTimes(); - EasyMock.replay(endpoint); + Endpoint endpoint = mock(Endpoint.class); + when(endpoint.getEndpointInfo()).thenReturn(null); + when(endpoint.get(Application.class.getName())).thenReturn(null); + when(endpoint.size()).thenReturn(0); + when(endpoint.isEmpty()).thenReturn(true); + when(endpoint.get(ServerProviderFactory.class.getName())).thenReturn(factory); e.put(Endpoint.class, endpoint); return m; }
