From 74f38ec9f26e57c2306a8412e292f0ee8c4287bb Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 14 Feb 2026 09:36:14 +0000 Subject: [PATCH 1/2] Mockito improvements Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.java.testing.easymock.EasyMockToMockito?organizationId=YTA5ODhiOTYtNDI5OS00OGY3LTg0NjctNGZiNmI4OTY1ZjY3 Co-authored-by: Moderne --- pom.xml | 4 ++-- .../plugins/assembly/archive/DefaultAssemblyArchiverTest.java | 3 --- .../assembly/archive/ManifestCreationFinalizerTest.java | 3 --- .../assembly/archive/archiver/AssemblyProxyArchiverTest.java | 3 --- .../archive/phase/DependencySetAssemblyPhaseTest.java | 3 --- .../assembly/archive/phase/FileItemAssemblyPhaseTest.java | 3 --- .../assembly/archive/phase/FileSetAssemblyPhaseTest.java | 3 --- .../assembly/archive/phase/ModuleSetAssemblyPhaseTest.java | 3 --- .../plugins/assembly/archive/task/AddArtifactTaskTest.java | 3 --- .../assembly/archive/task/AddDependencySetsTaskTest.java | 3 --- .../plugins/assembly/archive/task/AddDirectoryTaskTest.java | 3 --- .../plugins/assembly/archive/task/AddFileSetsTaskTest.java | 3 --- .../assembly/artifact/DefaultDependencyResolverTest.java | 3 --- .../interpolation/AssemblyExpressionEvaluatorTest.java | 3 --- .../assembly/interpolation/AssemblyInterpolatorTest.java | 3 --- .../maven/plugins/assembly/io/DefaultAssemblyReaderTest.java | 3 --- .../maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java | 3 --- .../apache/maven/plugins/assembly/utils/FilterUtilsTest.java | 3 --- 18 files changed, 2 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index 12eb7758..c20efd43 100644 --- a/pom.xml +++ b/pom.xml @@ -227,13 +227,13 @@ under the License. org.mockito mockito-core - 4.11.0 + 5.21.0 test org.mockito mockito-junit-jupiter - 4.11.0 + 5.21.0 test diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java index ee4c0da7..303831c4 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java @@ -51,8 +51,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -68,7 +66,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) public class DefaultAssemblyArchiverTest { @TempDir diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java index 70863014..a5398849 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java @@ -38,12 +38,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertTrue; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class ManifestCreationFinalizerTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java index 032e914e..c597990d 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java @@ -41,8 +41,6 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -51,7 +49,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AssemblyProxyArchiverTest { @TempDir diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java index ec088589..c47bfc98 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java @@ -32,8 +32,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; @@ -42,7 +40,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class DependencySetAssemblyPhaseTest { private DependencySetAssemblyPhase phase; diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java index cc4d8506..fda15456 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +46,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class FileItemAssemblyPhaseTest { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java index 421586b2..aeb29973 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java @@ -29,15 +29,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class FileSetAssemblyPhaseTest { private FileSetAssemblyPhase phase; diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java index 01d8c25d..3a290e79 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java @@ -47,8 +47,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +66,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class ModuleSetAssemblyPhaseTest { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java index 90b1a362..69cd2158 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java @@ -38,8 +38,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +48,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AddArtifactTaskTest { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java index e4946c65..870ccfe0 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java @@ -52,8 +52,6 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.ArgumentCaptor; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -67,7 +65,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AddDependencySetsTaskTest { @TempDir diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java index 5999201c..a0d8e381 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java @@ -28,15 +28,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AddDirectoryTaskTest { @TempDir diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java index ac82899f..5792ea86 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java @@ -33,8 +33,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -45,7 +43,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AddFileSetsTaskTest { @TempDir diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java index 8ed0e7d9..35bc429f 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java @@ -47,8 +47,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -58,7 +56,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class DefaultDependencyResolverTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java index cbf41632..698cfe00 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluatorTest.java @@ -30,15 +30,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AssemblyExpressionEvaluatorTest { private final PojoConfigSource configSourceStub = new PojoConfigSource(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java index a5392c77..56c25cbe 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolatorTest.java @@ -39,14 +39,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AssemblyInterpolatorTest { @Test diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java index 8a2acab8..8c083a4b 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java @@ -54,8 +54,6 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -64,7 +62,6 @@ import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) public class DefaultAssemblyReaderTest { diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java index 4015dc90..ee258b32 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java @@ -35,8 +35,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,7 +43,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class AssemblyFormatUtilsTest { @Test diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java index b5684b55..afd2b265 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java @@ -33,8 +33,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import org.mockito.junit.jupiter.MockitoSettings; -import org.mockito.quality.Strictness; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -45,7 +43,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@MockitoSettings(strictness = Strictness.WARN) @ExtendWith(MockitoExtension.class) class FilterUtilsTest { From 2358c132078001113e276f2666c695d2446b951f Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 14 Feb 2026 10:41:33 +0100 Subject: [PATCH 2/2] Downgrade Mockito version to 4.11.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c20efd43..12eb7758 100644 --- a/pom.xml +++ b/pom.xml @@ -227,13 +227,13 @@ under the License. org.mockito mockito-core - 5.21.0 + 4.11.0 test org.mockito mockito-junit-jupiter - 5.21.0 + 4.11.0 test