This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git

commit 7a9832ae321eba22c063f6c4c40a37a5e9a5518f
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 16 22:08:12 2026 +0000

    Use JUnit 5 assertions and Mockito best practices in tests
---
 .../shared/filtering/DefaultMavenFileFilterTest.java | 20 +++++++++-----------
 .../maven/shared/filtering/FilteringUtilsTest.java   |  7 +++----
 ...imiterInterpolatorFilterReaderLineEndingTest.java | 10 +++++++++-
 .../maven/shared/filtering/PropertyUtilsTest.java    |  4 ++--
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git 
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
 
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
index 3bebb76..7723483 100644
--- 
a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++ 
b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -208,18 +208,16 @@ class DefaultMavenFileFilterTest {
     @Test
     void interpolatorCustomizer() throws Exception {
         AbstractMavenFilteringRequest req = new 
AbstractMavenFilteringRequest();
-        req.setInterpolatorCustomizer(i -> {
-            i.addValueSource(new AbstractValueSource(false) {
-
-                @Override
-                public Object getValue(String expression) {
-                    if (expression.equals("foo")) {
-                        return "bar";
-                    }
-                    return null;
+        req.setInterpolatorCustomizer(i -> i.addValueSource(new 
AbstractValueSource(false) {
+
+            @Override
+            public Object getValue(String expression) {
+                if (expression.equals("foo")) {
+                    return "bar";
                 }
-            });
-        });
+                return null;
+            }
+        }));
 
         List<FilterWrapper> wrappers = 
mavenFileFilter.getDefaultFilterWrappers(req);
 
diff --git 
a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java 
b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
index 701ba75..7a4eb90 100644
--- a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
@@ -19,7 +19,6 @@
 package org.apache.maven.shared.filtering;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -43,7 +42,7 @@ class FilteringUtilsTest {
     private static File testDirectory = new File(getBasedir(), 
"target/test-classes/");
 
     @Test
-    void mSHARED1213CopyWithTargetAlreadyExisting0ByteFile() throws 
IOException {
+    void mSHARED1213CopyWithTargetAlreadyExisting0ByteFile() throws Exception {
         File fromFile = new File(getBasedir() + 
"/src/test/units-files/MSHARED-1213/enunciate.xml");
         File toFile = new File(testDirectory, "MSHARED-1213-enunciate.xml");
         Files.write(toFile.toPath(), "".getBytes(StandardCharsets.UTF_8));
@@ -66,7 +65,7 @@ class FilteringUtilsTest {
     }
 
     @Test
-    void mSHARED1213CopyWithTargetAlreadyExistingJunkFile() throws IOException 
{
+    void mSHARED1213CopyWithTargetAlreadyExistingJunkFile() throws Exception {
         File fromFile = new File(getBasedir() + 
"/src/test/units-files/MSHARED-1213/enunciate.xml");
         File toFile = new File(testDirectory, "MSHARED-1213-enunciate.xml");
         Files.write(toFile.toPath(), "junk".getBytes(StandardCharsets.UTF_8));
@@ -89,7 +88,7 @@ class FilteringUtilsTest {
     }
 
     @Test
-    void mSHARED1213CopyWithTargetAlreadyExistingSameFile() throws IOException 
{
+    void mSHARED1213CopyWithTargetAlreadyExistingSameFile() throws Exception {
         File fromFile = new File(getBasedir() + 
"/src/test/units-files/MSHARED-1213/enunciate.xml");
         File toFile = new File(testDirectory, "MSHARED-1213-enunciate.xml");
         Files.copy(fromFile.toPath(), toFile.toPath(), 
StandardCopyOption.REPLACE_EXISTING);
diff --git 
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
 
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
index 867613b..aac39bf 100644
--- 
a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++ 
b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
 import org.apache.commons.io.IOUtils;
 import org.codehaus.plexus.interpolation.Interpolator;
 import org.codehaus.plexus.interpolation.RecursionInterceptor;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
@@ -39,13 +40,15 @@ import static org.mockito.Mockito.when;
 
 class MultiDelimiterInterpolatorFilterReaderLineEndingTest extends 
AbstractInterpolatorFilterReaderLineEndingTest {
 
+    private AutoCloseable mocks;
+
     @Mock
     private Interpolator interpolator;
 
     @Override
     @BeforeEach
     public void onSetup() {
-        MockitoAnnotations.initMocks(this);
+        mocks = MockitoAnnotations.openMocks(this);
     }
 
     @Override
@@ -127,4 +130,9 @@ class MultiDelimiterInterpolatorFilterReaderLineEndingTest 
extends AbstractInter
 
         assertEquals(markLength, reader.markLength, "mark length should 
reflect the current delimiter set");
     }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        mocks.close();
+    }
 }
diff --git 
a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java 
b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index 4b63992..7084af2 100644
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -155,7 +155,7 @@ class PropertyUtilsTest {
     }
 
     @Test
-    void nonCircularReferences1Var3Times() throws IOException {
+    void nonCircularReferences1Var3Times() throws Exception {
         File nonCircularProperties = File.createTempFile("non-circular", 
".properties");
         nonCircularProperties.deleteOnExit();
 
@@ -172,7 +172,7 @@ class PropertyUtilsTest {
     }
 
     @Test
-    void nonCircularReferences2Vars2Times() throws IOException {
+    void nonCircularReferences2Vars2Times() throws Exception {
         File nonCircularProperties = File.createTempFile("non-circular", 
".properties");
         nonCircularProperties.deleteOnExit();
 

Reply via email to