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-resolver-ant-tasks.git
commit d63800e5715a52c48c095d1bd4a94fb4a42b9d77 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 07:47:04 2026 +0000 Use JUnit 5 assertions and Mockito best practices in tests --- .../maven/resolver/internal/ant/AntRepoSysTest.java | 16 ++++++++++------ .../apache/maven/resolver/internal/ant/InstallTest.java | 3 +-- .../apache/maven/resolver/internal/ant/ReactorTest.java | 13 ++++++------- .../apache/maven/resolver/internal/ant/ResolveTest.java | 8 ++++---- .../apache/maven/resolver/internal/ant/SettingsTest.java | 3 +-- .../maven/resolver/internal/ant/tasks/CreatePomTest.java | 2 +- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java index 1c7d4a1..0fe01dd 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; public class AntRepoSysTest { @@ -66,8 +67,9 @@ public class AntRepoSysTest { @Test public void testDependencyManagerIsClassicByDefault() { try (RepositorySystemSession.CloseableSession session = newSession()) { - assertTrue( - session.getDependencyManager() instanceof ClassicDependencyManager, + assertInstanceOf( + ClassicDependencyManager.class, + session.getDependencyManager(), "expected the classic dependency manager, got " + session.getDependencyManager()); } } @@ -77,8 +79,9 @@ public class AntRepoSysTest { project.setProperty(Names.PROPERTY_DEPENDENCY_MANAGER_TRANSITIVITY, "true"); try (RepositorySystemSession.CloseableSession session = newSession()) { - assertTrue( - session.getDependencyManager() instanceof TransitiveDependencyManager, + assertInstanceOf( + TransitiveDependencyManager.class, + session.getDependencyManager(), "expected the transitive dependency manager, got " + session.getDependencyManager()); } } @@ -88,8 +91,9 @@ public class AntRepoSysTest { project.setProperty(Names.PROPERTY_DEPENDENCY_MANAGER_TRANSITIVITY, "false"); try (RepositorySystemSession.CloseableSession session = newSession()) { - assertTrue( - session.getDependencyManager() instanceof ClassicDependencyManager, + assertInstanceOf( + ClassicDependencyManager.class, + session.getDependencyManager(), "expected the classic dependency manager, got " + session.getDependencyManager()); } } diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java index ad37594..58cf277 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java @@ -19,7 +19,6 @@ package org.apache.maven.resolver.internal.ant; import java.io.File; -import java.io.IOException; import org.junit.jupiter.api.Test; @@ -70,7 +69,7 @@ public class InstallTest extends AntBuildsTest { } @Test - public void testCustomRepo() throws IOException { + public void testCustomRepo() throws Exception { File repoPath = new File(BUILD_DIR, "local-repo-custom"); executeTarget("testCustomRepo"); diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java index 3c9273e..50f0b5b 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java @@ -19,7 +19,6 @@ package org.apache.maven.resolver.internal.ant; import java.io.File; -import java.io.IOException; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -36,7 +35,7 @@ public class ReactorTest extends AntBuildsTest { } @Test - public void testPom() throws IOException { + public void testPom() throws Exception { executeTarget("testPom"); ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); File found = reader.findArtifact(artifact("test:test:pom:0.1-SNAPSHOT")); @@ -45,7 +44,7 @@ public class ReactorTest extends AntBuildsTest { } @Test - public void testArtifact() throws IOException { + public void testArtifact() throws Exception { executeTarget("testArtifact"); ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); File found = reader.findArtifact(artifact("test:test:pom:0.1-SNAPSHOT")); @@ -58,7 +57,7 @@ public class ReactorTest extends AntBuildsTest { } @Test - public void testArtifactInMemoryPom() throws IOException { + public void testArtifactInMemoryPom() throws Exception { executeTarget("testArtifactInMemoryPom"); ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); File found = reader.findArtifact(artifact("test:test:pom:0.1-SNAPSHOT")); @@ -70,14 +69,14 @@ public class ReactorTest extends AntBuildsTest { } @Test - public void testResolveArtifact() throws IOException { + public void testResolveArtifact() throws Exception { executeTarget("testResolveArtifact"); String prop = getProject().getProperty("resolve.test:test:jar"); assertEquals(new File(projectDir, "pom1.xml").getAbsolutePath(), prop); } @Test - public void testResolveArtifactInMemoryPom() throws IOException { + public void testResolveArtifactInMemoryPom() throws Exception { executeTarget("testResolveArtifactInMemoryPom"); String prop = getProject().getProperty("resolve.test:test:jar"); assertEquals(new File(projectDir, "pom1.xml").getAbsolutePath(), prop); @@ -85,7 +84,7 @@ public class ReactorTest extends AntBuildsTest { } @Test - public void testResolveVersionRange() throws IOException { + public void testResolveVersionRange() throws Exception { executeTarget("testResolveVersionRange"); String prop = getProject().getProperty("resolve.test:test:jar"); assertEquals(new File(projectDir, "pom1.xml").getAbsolutePath(), prop); diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java index 1324755..36a52fc 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java @@ -19,7 +19,6 @@ package org.apache.maven.resolver.internal.ant; import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.Iterator; import java.util.Map; @@ -30,6 +29,7 @@ import org.apache.tools.ant.types.resources.FileResource; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -71,7 +71,7 @@ public class ResolveTest extends AntBuildsTest { } @Test - public void testResolveCustomFileLayout() throws IOException { + public void testResolveCustomFileLayout() throws Exception { File dir = new File(BUILD_DIR, "resolve-custom-layout"); executeTarget("testResolveCustomFileLayout"); @@ -81,7 +81,7 @@ public class ResolveTest extends AntBuildsTest { } @Test - public void testResolveAttachments() throws IOException { + public void testResolveAttachments() throws Exception { File dir = new File(BUILD_DIR, "resolve-attachments"); executeTarget("testResolveAttachments"); @@ -106,7 +106,7 @@ public class ResolveTest extends AntBuildsTest { executeTarget("testResolvePath"); Map<?, ?> refs = getProject().getReferences(); Object obj = refs.get("out"); - assertTrue(obj instanceof Path, "ref 'out' is no path"); + assertInstanceOf(Path.class, obj, "ref 'out' is no path"); Path path = (Path) obj; String[] elements = path.list(); assertTrue( diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java index 9d43606..656e605 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java @@ -19,7 +19,6 @@ package org.apache.maven.resolver.internal.ant; import java.io.File; -import java.io.IOException; import org.junit.jupiter.api.Test; @@ -60,7 +59,7 @@ public class SettingsTest extends AntBuildsTest { } @Test - public void testFallback() throws IOException { + public void testFallback() throws Exception { executeTarget("setUp"); assertTrue( AntRepoSys.getInstance(getProject()) diff --git a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java index b4894e6..ee4500d 100644 --- a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java +++ b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java @@ -44,7 +44,7 @@ public class CreatePomTest extends AntBuildsTest { } @Test - public void testCreatePom() throws IOException, XmlPullParserException { + public void testCreatePom() throws Exception { executeTarget("setup"); String pomPath = getProject().getProperty("pomFile");
