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 6fa71dd2796347e8f32f07955e27a1f6cc60983f Author: Andriy Redko <[email protected]> AuthorDate: Wed Aug 30 10:33:11 2023 -0400 CXF-8853: Get rid of EasyMock in cxf-services-xkms-x509-handlers (#1401) (cherry picked from commit 2ecb82b00d6ba9bdcb35c92de73d72b3faa564d7) --- services/xkms/xkms-x509-handlers/pom.xml | 5 +++-- .../java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index 1d019125f0..7dc9c6e474 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -69,8 +69,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> </dependencies> diff --git a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java index 2622444ed2..b78eae1aae 100644 --- a/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java +++ b/services/xkms/xkms-x509-handlers/src/test/java/org/apache/cxf/xkms/x509/handlers/X509LocatorTest.java @@ -33,10 +33,12 @@ import org.apache.cxf.xkms.model.xkms.UnverifiedKeyBindingType; import org.apache.cxf.xkms.model.xkms.UseKeyWithType; import org.apache.cxf.xkms.x509.repo.CertificateRepo; -import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * Test needs a real LDAP server. */ @@ -47,9 +49,8 @@ public class X509LocatorTest { @Test public void locate() throws CertificateException { - CertificateRepo certRepo = EasyMock.createMock(CertificateRepo.class); - EasyMock.expect(certRepo.findBySubjectDn(EasyMock.eq("alice"))).andReturn(getAliceCert()); - EasyMock.replay(certRepo); + CertificateRepo certRepo = mock(CertificateRepo.class); + when(certRepo.findBySubjectDn(eq("alice"))).thenReturn(getAliceCert()); X509Locator locator = new X509Locator(certRepo); LocateRequestType request = prepareLocateXKMSRequest(); UnverifiedKeyBindingType result = locator.locate(request);
