Skip to content

Mockito improvements #1462

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

Closed
slachiewicz wants to merge 2 commits into from
+18 −20
Closed

Mockito improvements #1462

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
5bc1d1e
Mockito improvements
slachiewicz Feb 14, 2026
f6c1db6
Downgrade Mockito version 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
5 changes: 2 additions & 3 deletions ...er/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
Expand Down Expand Up @@ -146,7 +145,7 @@ private void prepareCheckin(String message) throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq(message)))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -160,7 +159,7 @@ private void verifyCheckin(String message) throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq(message));
isNull(), eq(message));
verifyNoMoreInteractions(scmProviderMock);
}

Expand Down
33 changes: 16 additions & 17 deletions ...er/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.provider.ScmProvider;
Expand Down Expand Up @@ -109,7 +108,7 @@ void testCommit() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq(PREFIX + "release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -126,7 +125,7 @@ void testCommit() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq(PREFIX + "release-label"));
isNull(), eq(PREFIX + "release-label"));
verifyNoMoreInteractions(scmProviderMock);
}

Expand All @@ -148,7 +147,7 @@ void testCommitAlternateMessage() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq("[release] Release of groupId:artifactId release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -165,7 +164,7 @@ void testCommitAlternateMessage() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq("[release] Release of groupId:artifactId release-label"));
isNull(), eq("[release] Release of groupId:artifactId release-label"));
verifyNoMoreInteractions(scmProviderMock);
}

Expand All @@ -191,7 +190,7 @@ void testCommitMultiModule() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq(PREFIX + "release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -207,7 +206,7 @@ void testCommitMultiModule() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq(PREFIX + "release-label"));
isNull(), eq(PREFIX + "release-label"));
verifyNoMoreInteractions(scmProviderMock);
}

Expand All @@ -228,7 +227,7 @@ void testCommitDevelopment() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq("[maven-release-manager] prepare for next development iteration")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -246,7 +245,7 @@ void testCommitDevelopment() throws Exception {
.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq("[maven-release-manager] prepare for next development iteration"));
verifyNoMoreInteractions(scmProviderMock);
}
Expand All @@ -270,7 +269,7 @@ void testCommitDevelopmentAlternateMessage() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq("[release] Bump version of groupId:artifactId after release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -288,7 +287,7 @@ void testCommitDevelopmentAlternateMessage() throws Exception {
.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq("[release] Bump version of groupId:artifactId after release-label"));
verifyNoMoreInteractions(scmProviderMock);
}
Expand Down Expand Up @@ -327,7 +326,7 @@ void testCommitGenerateReleasePoms() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq(PREFIX + "release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -344,7 +343,7 @@ void testCommitGenerateReleasePoms() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq(PREFIX + "release-label"));
isNull(), eq(PREFIX + "release-label"));
verifyNoMoreInteractions(scmProviderMock);
}

Expand Down Expand Up @@ -429,7 +428,7 @@ void testScmExceptionThrown() throws Exception {

ScmProvider scmProviderMock = mock(ScmProvider.class);
when(scmProviderMock.checkIn(
isA(ScmRepository.class), isA(ScmFileSet.class), isNull(ScmVersion.class), isA(String.class)))
isA(ScmRepository.class), isA(ScmFileSet.class), isNull(), isA(String.class)))
.thenThrow(new ScmException("..."));

scmManager.setScmProvider(scmProviderMock);
Expand All @@ -448,7 +447,7 @@ void testScmExceptionThrown() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), isA(ScmFileSet.class),
isNull(ScmVersion.class), isA(String.class));
isNull(), isA(String.class));
verifyNoMoreInteractions(scmProviderMock);
}

Expand Down Expand Up @@ -543,7 +542,7 @@ void testCommitMultiModuleWithCheckModificationExcludes() throws Exception {
when(scmProviderMock.checkIn(
isA(ScmRepository.class),
argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class),
isNull(),
eq(PREFIX + "release-label")))
.thenReturn(new CheckInScmResult(
"...",
Expand All @@ -559,7 +558,7 @@ void testCommitMultiModuleWithCheckModificationExcludes() throws Exception {
verify(scmProviderMock)
.checkIn(
isA(ScmRepository.class), argThat(new IsScmFileSetEquals(fileSet)),
isNull(ScmVersion.class), eq(PREFIX + "release-label"));
isNull(), eq(PREFIX + "release-label"));
verifyNoMoreInteractions(scmProviderMock);
}

Expand Down
Loading