Skip to content

Mockito improvements #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slachiewicz wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Mockito improvements #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f668633
Mockito improvements
slachiewicz Feb 14, 2026
5c1f48c
Downgrade Mockito version from 5.21.0 to 4.11.0
slachiewicz Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,6 @@
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
</dependency>

<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand All @@ -130,6 +123,12 @@
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
Expand Down
87 changes: 32 additions & 55 deletions src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -72,7 +71,6 @@ void shouldConstructWithNoParamsAndHaveNonNullMessageHolder() {

@Test
void shouldConstructWithWagonManager() {
replay(wagonManager);

new DefaultDownloadManager(wagonManager);

Expand All @@ -81,7 +79,6 @@ void shouldConstructWithWagonManager() {

@Test
void shouldFailToDownloadMalformedURL() {
replay(wagonManager);

DownloadManager mgr = new DefaultDownloadManager(wagonManager);

Expand All @@ -103,8 +100,6 @@ void shouldDownloadFromTempFileWithNoTransferListeners() throws Exception {

setupDefaultMockConfiguration();

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

downloadManager.download(tempFile.toURI().toASCIIString(), new DefaultMessageHolder());
Expand All @@ -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());
Expand All @@ -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(
Expand All @@ -168,8 +159,6 @@ void shouldFailToDownloadWhenWagonProtocolNotFound() throws Exception {

setupMocksWithWagonManagerGetException(new UnsupportedProtocolException("not supported"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -190,8 +179,6 @@ void shouldFailToDownloadWhenWagonConnectThrowsConnectionException() throws Exce

setupMocksWithWagonConnectionException(new ConnectionException("connect error"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -212,8 +199,6 @@ void shouldFailToDownloadWhenWagonConnectThrowsAuthenticationException() throws

setupMocksWithWagonConnectionException(new AuthenticationException("bad credentials"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -234,8 +219,6 @@ void shouldFailToDownloadWhenWagonGetThrowsTransferFailedException() throws Exce

setupMocksWithWagonGetException(new TransferFailedException("bad transfer"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -256,8 +239,6 @@ void shouldFailToDownloadWhenWagonGetThrowsResourceDoesNotExistException() throw

setupMocksWithWagonGetException(new ResourceDoesNotExistException("bad resource"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -278,8 +259,6 @@ void shouldFailToDownloadWhenWagonGetThrowsAuthorizationException() throws Excep

setupMocksWithWagonGetException(new AuthorizationException("bad transfer"));

replay(wagon, wagonManager);

DownloadManager downloadManager = new DefaultDownloadManager(wagonManager);

try {
Expand All @@ -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();
Expand All @@ -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!!");
}
Expand All @@ -342,25 +319,25 @@ 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!!");
}

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!!");
}
Expand All @@ -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!!");
}
Expand All @@ -396,30 +373,30 @@ 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!!");
}

assertDoesNotThrow(
() -> {
wagon.disconnect();
expectLastCall().andThrow(error);
expectLastCall().thenThrow(error);
},
"This shouldn't happen!!");
}
Expand Down
Loading
Loading