diff --git a/pom.xml b/pom.xml index ca61dae..d592964 100644 --- a/pom.xml +++ b/pom.xml @@ -112,13 +112,6 @@ commons-io 2.21.0 - - - org.easymock - easymock - 5.6.0 - test - org.apache.commons commons-lang3 @@ -130,6 +123,12 @@ junit-jupiter-api test + + org.mockito + mockito-core + 4.11.0 + test + org.codehaus.plexus plexus-xml diff --git a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java index 27a566f..1e41265 100644 --- a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java +++ b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java @@ -40,13 +40,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.expectLastCall; +import static org.mockito.Mockito.verify; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -61,8 +60,8 @@ class DefaultDownloadManagerTest { @BeforeEach void setUp() { - wagonManager = createMock(WagonManager.class); - wagon = createMock(Wagon.class); + wagonManager = mock(WagonManager.class); + wagon = mock(Wagon.class); } @Test @@ -72,7 +71,6 @@ void shouldConstructWithNoParamsAndHaveNonNullMessageHolder() { @Test void shouldConstructWithWagonManager() { - replay(wagonManager); new DefaultDownloadManager(wagonManager); @@ -81,7 +79,6 @@ void shouldConstructWithWagonManager() { @Test void shouldFailToDownloadMalformedURL() { - replay(wagonManager); DownloadManager mgr = new DefaultDownloadManager(wagonManager); @@ -103,8 +100,6 @@ void shouldDownloadFromTempFileWithNoTransferListeners() throws Exception { setupDefaultMockConfiguration(); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); downloadManager.download(tempFile.toURI().toASCIIString(), new DefaultMessageHolder()); @@ -119,8 +114,6 @@ void shouldDownloadFromTempFileTwiceAndUseCache() throws Exception { setupDefaultMockConfiguration(); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); File first = downloadManager.download(tempFile.toURI().toASCIIString(), new DefaultMessageHolder()); @@ -143,14 +136,12 @@ void shouldDownloadFromTempFileWithOneTransferListener() throws Exception { setupDefaultMockConfiguration(); - TransferListener transferListener = createMock(TransferListener.class); + TransferListener transferListener = mock(TransferListener.class); wagon.addTransferListener(transferListener); wagon.removeTransferListener(transferListener); - replay(wagon, wagonManager, transferListener); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); downloadManager.download( @@ -168,8 +159,6 @@ void shouldFailToDownloadWhenWagonProtocolNotFound() throws Exception { setupMocksWithWagonManagerGetException(new UnsupportedProtocolException("not supported")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -190,8 +179,6 @@ void shouldFailToDownloadWhenWagonConnectThrowsConnectionException() throws Exce setupMocksWithWagonConnectionException(new ConnectionException("connect error")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -212,8 +199,6 @@ void shouldFailToDownloadWhenWagonConnectThrowsAuthenticationException() throws setupMocksWithWagonConnectionException(new AuthenticationException("bad credentials")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -234,8 +219,6 @@ void shouldFailToDownloadWhenWagonGetThrowsTransferFailedException() throws Exce setupMocksWithWagonGetException(new TransferFailedException("bad transfer")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -256,8 +239,6 @@ void shouldFailToDownloadWhenWagonGetThrowsResourceDoesNotExistException() throw setupMocksWithWagonGetException(new ResourceDoesNotExistException("bad resource")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -278,8 +259,6 @@ void shouldFailToDownloadWhenWagonGetThrowsAuthorizationException() throws Excep setupMocksWithWagonGetException(new AuthorizationException("bad transfer")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); try { @@ -300,8 +279,6 @@ void shouldFailToDownloadWhenWagonDisconnectThrowsConnectionException() throws E setupMocksWithWagonDisconnectException(new ConnectionException("not connected")); - replay(wagon, wagonManager); - DownloadManager downloadManager = new DefaultDownloadManager(wagonManager); MessageHolder mh = new DefaultMessageHolder(); @@ -316,22 +293,22 @@ void shouldFailToDownloadWhenWagonDisconnectThrowsConnectionException() throws E private void setupDefaultMockConfiguration() { assertDoesNotThrow( () -> { - expect(wagonManager.getWagon("file")).andReturn(wagon); + when(wagonManager.getWagon("file")).thenReturn(wagon); }, "This shouldn't happen!!"); - expect(wagonManager.getAuthenticationInfo(anyString())).andReturn(null); + when(wagonManager.getAuthenticationInfo(anyString())).thenReturn(null); - expect(wagonManager.getProxy(anyString())).andReturn(null); + when(wagonManager.getProxy(anyString())).thenReturn(null); try { - wagon.connect(anyObject(Repository.class), anyObject(AuthenticationInfo.class), anyObject(ProxyInfo.class)); + wagon.connect(any(Repository.class), any(AuthenticationInfo.class), any(ProxyInfo.class)); } catch (ConnectionException | AuthenticationException e) { fail("This shouldn't happen!!"); } try { - wagon.get(anyString(), anyObject(File.class)); + wagon.get(anyString(), any(File.class)); } catch (TransferFailedException | AuthorizationException | ResourceDoesNotExistException e) { fail("This shouldn't happen!!"); } @@ -342,7 +319,7 @@ private void setupDefaultMockConfiguration() { private void setupMocksWithWagonManagerGetException(Throwable error) { assertDoesNotThrow( () -> { - expect(wagonManager.getWagon("file")).andThrow(error); + when(wagonManager.getWagon("file")).thenThrow(error); }, "This shouldn't happen!!"); } @@ -350,17 +327,17 @@ private void setupMocksWithWagonManagerGetException(Throwable error) { private void setupMocksWithWagonConnectionException(Throwable error) { assertDoesNotThrow( () -> { - expect(wagonManager.getWagon("file")).andReturn(wagon); + when(wagonManager.getWagon("file")).thenReturn(wagon); }, "This shouldn't happen!!"); - expect(wagonManager.getAuthenticationInfo(anyString())).andReturn(null); + when(wagonManager.getAuthenticationInfo(anyString())).thenReturn(null); - expect(wagonManager.getProxy(anyString())).andReturn(null); + when(wagonManager.getProxy(anyString())).thenReturn(null); try { - wagon.connect(anyObject(Repository.class), anyObject(AuthenticationInfo.class), anyObject(ProxyInfo.class)); - expectLastCall().andThrow(error); + wagon.connect(any(Repository.class), any(AuthenticationInfo.class), any(ProxyInfo.class)); + expectLastCall().thenThrow(error); } catch (ConnectionException | AuthenticationException e) { fail("This shouldn't happen!!"); } @@ -369,23 +346,23 @@ private void setupMocksWithWagonConnectionException(Throwable error) { private void setupMocksWithWagonGetException(Throwable error) { assertDoesNotThrow( () -> { - expect(wagonManager.getWagon("file")).andReturn(wagon); + when(wagonManager.getWagon("file")).thenReturn(wagon); }, "This shouldn't happen!!"); - expect(wagonManager.getAuthenticationInfo(anyString())).andReturn(null); + when(wagonManager.getAuthenticationInfo(anyString())).thenReturn(null); - expect(wagonManager.getProxy(anyString())).andReturn(null); + when(wagonManager.getProxy(anyString())).thenReturn(null); try { - wagon.connect(anyObject(Repository.class), anyObject(AuthenticationInfo.class), anyObject(ProxyInfo.class)); + wagon.connect(any(Repository.class), any(AuthenticationInfo.class), any(ProxyInfo.class)); } catch (ConnectionException | AuthenticationException e) { fail("This shouldn't happen!!"); } try { - wagon.get(anyString(), anyObject(File.class)); - expectLastCall().andThrow(error); + wagon.get(anyString(), any(File.class)); + expectLastCall().thenThrow(error); } catch (TransferFailedException | AuthorizationException | ResourceDoesNotExistException e) { fail("This shouldn't happen!!"); } @@ -396,22 +373,22 @@ private void setupMocksWithWagonGetException(Throwable error) { private void setupMocksWithWagonDisconnectException(Throwable error) { assertDoesNotThrow( () -> { - expect(wagonManager.getWagon("file")).andReturn(wagon); + when(wagonManager.getWagon("file")).thenReturn(wagon); }, "This shouldn't happen!!"); - expect(wagonManager.getAuthenticationInfo(anyString())).andReturn(null); + when(wagonManager.getAuthenticationInfo(anyString())).thenReturn(null); - expect(wagonManager.getProxy(anyString())).andReturn(null); + when(wagonManager.getProxy(anyString())).thenReturn(null); try { - wagon.connect(anyObject(Repository.class), anyObject(AuthenticationInfo.class), anyObject(ProxyInfo.class)); + wagon.connect(any(Repository.class), any(AuthenticationInfo.class), any(ProxyInfo.class)); } catch (ConnectionException | AuthenticationException e) { fail("This shouldn't happen!!"); } try { - wagon.get(anyString(), anyObject(File.class)); + wagon.get(anyString(), any(File.class)); } catch (TransferFailedException | AuthorizationException | ResourceDoesNotExistException e) { fail("This shouldn't happen!!"); } @@ -419,7 +396,7 @@ private void setupMocksWithWagonDisconnectException(Throwable error) { assertDoesNotThrow( () -> { wagon.disconnect(); - expectLastCall().andThrow(error); + expectLastCall().thenThrow(error); }, "This shouldn't happen!!"); } diff --git a/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java b/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java index 3ab8143..343731b 100644 --- a/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java +++ b/src/test/java/org/apache/maven/shared/io/location/ArtifactLocatorStrategyTest.java @@ -33,11 +33,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.expectLastCall; +import static org.mockito.Mockito.verify; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -55,14 +54,13 @@ class ArtifactLocatorStrategyTest { @BeforeEach void setUp() { - factory = createMock(ArtifactFactory.class); - resolver = createMock(ArtifactResolver.class); - localRepository = createMock(ArtifactRepository.class); + factory = mock(ArtifactFactory.class); + resolver = mock(ArtifactResolver.class); + localRepository = mock(ArtifactRepository.class); } @Test void shouldConstructWithoutDefaultArtifactType() { - replay(factory, resolver, localRepository); new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); @@ -71,7 +69,6 @@ void shouldConstructWithoutDefaultArtifactType() { @Test void shouldConstructWithDefaultArtifactType() { - replay(factory, resolver, localRepository); new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST, "zip"); @@ -80,7 +77,6 @@ void shouldConstructWithDefaultArtifactType() { @Test void shouldFailToResolveSpecWithOneToken() { - replay(factory, resolver, localRepository); LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST, "zip"); @@ -96,7 +92,6 @@ void shouldFailToResolveSpecWithOneToken() { @Test void shouldFailToResolveSpecWithTwoTokens() { - replay(factory, resolver, localRepository); LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST, "zip"); @@ -115,13 +110,13 @@ void shouldResolveSpecWithThreeTokensUsingDefaultType() throws Exception { File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifact("group", "artifact", "version", null, "jar")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "jar")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -130,8 +125,6 @@ void shouldResolveSpecWithThreeTokensUsingDefaultType() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -151,13 +144,13 @@ void shouldResolveSpecWithThreeTokensUsingCustomizedDefaultType() throws Excepti File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifact("group", "artifact", "version", null, "zip")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "zip")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -166,8 +159,6 @@ void shouldResolveSpecWithThreeTokensUsingCustomizedDefaultType() throws Excepti fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST, "zip"); MessageHolder mh = new DefaultMessageHolder(); @@ -187,13 +178,13 @@ void shouldResolveSpecWithFourTokens() throws Exception { File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifact("group", "artifact", "version", null, "zip")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "zip")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -202,8 +193,6 @@ void shouldResolveSpecWithFourTokens() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -223,13 +212,13 @@ void shouldResolveSpecWithFiveTokens() throws Exception { File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifactWithClassifier("group", "artifact", "version", "zip", "classifier")) - .andReturn(artifact); + when(factory.createArtifactWithClassifier("group", "artifact", "version", "zip", "classifier")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -238,8 +227,6 @@ void shouldResolveSpecWithFiveTokens() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -259,13 +246,13 @@ void shouldResolveSpecWithFiveTokensAndEmptyTypeToken() throws Exception { File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifactWithClassifier("group", "artifact", "version", "jar", "classifier")) - .andReturn(artifact); + when(factory.createArtifactWithClassifier("group", "artifact", "version", "jar", "classifier")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -274,8 +261,6 @@ void shouldResolveSpecWithFiveTokensAndEmptyTypeToken() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -295,13 +280,13 @@ void shouldResolveSpecWithMoreThanFiveTokens() throws Exception { File tempFile = Files.createTempFile("artifact-location.", ".temp").toFile(); tempFile.deleteOnExit(); - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(tempFile); - expect(artifact.getFile()).andReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); + when(artifact.getFile()).thenReturn(tempFile); - expect(factory.createArtifactWithClassifier("group", "artifact", "version", "zip", "classifier")) - .andReturn(artifact); + when(factory.createArtifactWithClassifier("group", "artifact", "version", "zip", "classifier")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -310,8 +295,6 @@ void shouldResolveSpecWithMoreThanFiveTokens() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -330,13 +313,13 @@ void shouldResolveSpecWithMoreThanFiveTokens() throws Exception { @Test void shouldNotResolveSpecToArtifactWithNullFile() throws Exception { - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getFile()).andReturn(null); - expect(artifact.getId()).andReturn(""); + when(artifact.getFile()).thenReturn(null); + when(artifact.getId()).thenReturn(""); - expect(factory.createArtifact("group", "artifact", "version", null, "jar")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "jar")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); @@ -345,8 +328,6 @@ void shouldNotResolveSpecToArtifactWithNullFile() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -363,17 +344,17 @@ void shouldNotResolveSpecToArtifactWithNullFile() throws Exception { @Test void shouldNotResolveWhenArtifactNotFoundExceptionThrown() throws Exception { - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getId()).andReturn(""); + when(artifact.getId()).thenReturn(""); - expect(factory.createArtifact("group", "artifact", "version", null, "jar")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "jar")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); expectLastCall() - .andThrow(new ArtifactNotFoundException( + .thenThrow(new ArtifactNotFoundException( "not found", "group", "artifact", @@ -389,8 +370,6 @@ void shouldNotResolveWhenArtifactNotFoundExceptionThrown() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); @@ -408,17 +387,17 @@ void shouldNotResolveWhenArtifactNotFoundExceptionThrown() throws Exception { @Test void shouldNotResolveWhenArtifactResolutionExceptionThrown() throws Exception { - Artifact artifact = createMock(Artifact.class); + Artifact artifact = mock(Artifact.class); - expect(artifact.getId()).andReturn(""); + when(artifact.getId()).thenReturn(""); - expect(factory.createArtifact("group", "artifact", "version", null, "jar")) - .andReturn(artifact); + when(factory.createArtifact("group", "artifact", "version", null, "jar")) + .thenReturn(artifact); try { resolver.resolve(artifact, Collections.emptyList(), localRepository); expectLastCall() - .andThrow(new ArtifactResolutionException( + .thenThrow(new ArtifactResolutionException( "resolution failed", "group", "artifact", @@ -434,8 +413,6 @@ void shouldNotResolveWhenArtifactResolutionExceptionThrown() throws Exception { fail("This should NEVER happen. It's a mock!"); } - replay(factory, resolver, localRepository, artifact); - LocatorStrategy strategy = new ArtifactLocatorStrategy(factory, resolver, localRepository, Collections.EMPTY_LIST); MessageHolder mh = new DefaultMessageHolder(); diff --git a/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java b/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java index 0b14261..81a1f3a 100644 --- a/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java +++ b/src/test/java/org/apache/maven/shared/io/location/LocatorTest.java @@ -26,9 +26,8 @@ import org.apache.maven.shared.io.logging.MessageHolder; import org.junit.jupiter.api.Test; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -63,10 +62,8 @@ void shouldRetrieveNonNullMessageHolderWhenConstructedWithoutParams() { @Test void setStrategiesShouldClearAnyPreExistingStrategiesOut() { - LocatorStrategy originalStrategy = createMock(LocatorStrategy.class); - LocatorStrategy replacementStrategy = createMock(LocatorStrategy.class); - - replay(originalStrategy, replacementStrategy); + LocatorStrategy originalStrategy = mock(LocatorStrategy.class); + LocatorStrategy replacementStrategy = mock(LocatorStrategy.class); Locator locator = new Locator(); locator.addStrategy(originalStrategy); @@ -83,9 +80,7 @@ void setStrategiesShouldClearAnyPreExistingStrategiesOut() { @Test void shouldRemovePreviouslyAddedStrategy() { - LocatorStrategy originalStrategy = createMock(LocatorStrategy.class); - - replay(originalStrategy); + LocatorStrategy originalStrategy = mock(LocatorStrategy.class); Locator locator = new Locator(); locator.addStrategy(originalStrategy);