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-dependency-plugin.git
commit 1474a9583642a6dd4fc96cb6ba5e8f3e742f6c44 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 04:16:15 2026 +0000 Use JUnit 5 assertions and Mockito best practices in tests --- .../TestRequireExplicitDependencies.java | 3 +- .../fromDependencies/TestCopyDependenciesMojo.java | 17 +++--- .../TestUnpackDependenciesMojo.java | 5 +- .../TestUnpackDependenciesMojo2.java | 16 ++---- .../plugins/dependency/pom/PomEditorTest.java | 60 +++++++++++----------- .../ExcludeReactorProjectsArtifactFilterTest.java | 5 +- .../resolvers/ResolveDependenciesMojoTest.java | 10 ++-- .../dependency/tree/DependencySizesTest.java | 3 +- .../plugins/dependency/tree/TestTreeMojo.java | 3 +- .../dependency/utils/ArtifactCoordinatesTest.java | 13 ++--- 10 files changed, 62 insertions(+), 73 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java index 784e1965..8bc74b7c 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestRequireExplicitDependencies.java @@ -33,6 +33,7 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -118,7 +119,7 @@ class TestRequireExplicitDependencies { // the check passes; the execution then fails later, while resolving the artifact Exception e = assertThrows(Exception.class, mojo::execute); - assertTrue(!(e instanceof MojoFailureException), String.valueOf(e)); + assertFalse((e instanceof MojoFailureException), String.valueOf(e)); } @Test diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java index 39bceac9..6140a418 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java @@ -644,7 +644,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testArtifactResolutionException(CopyDependenciesMojo mojo) throws MojoFailureException { + void testArtifactResolutionException(CopyDependenciesMojo mojo) throws Exception { dotestArtifactExceptions(mojo); } @@ -669,8 +669,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testDontOverWriteRelease(CopyDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testDontOverWriteRelease(CopyDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact release = stubFactory.getReleaseArtifact(); @@ -700,8 +699,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testOverWriteRelease(CopyDependenciesMojo mojo) - throws MojoExecutionException, IOException, MojoFailureException { + void testOverWriteRelease(CopyDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact release = stubFactory.getReleaseArtifact(); @@ -731,8 +729,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testDontOverWriteSnap(CopyDependenciesMojo mojo) - throws MojoExecutionException, IOException, MojoFailureException { + void testDontOverWriteSnap(CopyDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact snap = stubFactory.getSnapshotArtifact(); @@ -762,7 +759,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testOverWriteSnap(CopyDependenciesMojo mojo) throws MojoExecutionException, IOException, MojoFailureException { + void testOverWriteSnap(CopyDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact snap = stubFactory.getSnapshotArtifact(); @@ -793,7 +790,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testGetDependencies(CopyDependenciesMojo mojo) throws MojoExecutionException { + void testGetDependencies(CopyDependenciesMojo mojo) throws Exception { assertTrue(mojo.getResolvedDependencies(true) .containsAll(mojo.getDependencySets(true).getResolvedDependencies())); } @@ -856,7 +853,7 @@ class TestCopyDependenciesMojo { @Test @InjectMojo(goal = "copy-dependencies") - void testExcludeTestScope(CopyDependenciesMojo mojo) throws IOException, MojoFailureException { + void testExcludeTestScope(CopyDependenciesMojo mojo) throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); mojo.excludeScope = "test"; diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java index c67d9967..47dffd1e 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugins.dependency.fromDependencies; import javax.inject.Inject; import java.io.File; -import java.io.IOException; import java.util.Iterator; import java.util.Set; @@ -189,7 +188,7 @@ class TestUnpackDependenciesMojo { @Test @InjectMojo(goal = "unpack-dependencies") - void testExcludeTestScope(UnpackDependenciesMojo mojo) throws IOException, MojoFailureException { + void testExcludeTestScope(UnpackDependenciesMojo mojo) throws Exception { mojo.getProject().setArtifacts(stubFactory.getScopedArtifacts()); mojo.excludeScope = "test"; @@ -511,7 +510,7 @@ class TestUnpackDependenciesMojo { @Test @InjectMojo(goal = "unpack-dependencies") - void testArtifactResolutionException(UnpackDependenciesMojo mojo) throws MojoFailureException { + void testArtifactResolutionException(UnpackDependenciesMojo mojo) throws Exception { dotestArtifactExceptions(mojo); } diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java index feae529a..e205e9dd 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java +++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java @@ -21,7 +21,6 @@ package org.apache.maven.plugins.dependency.fromDependencies; import javax.inject.Inject; import java.io.File; -import java.io.IOException; import java.util.HashSet; import java.util.Set; @@ -102,8 +101,7 @@ class TestUnpackDependenciesMojo2 { @Test @InjectMojo(goal = "unpack-dependencies") - void testDontOverWriteRelease(UnpackDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testDontOverWriteRelease(UnpackDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact release = stubFactory.getReleaseArtifact(); @@ -122,8 +120,7 @@ class TestUnpackDependenciesMojo2 { @Test @InjectMojo(goal = "unpack-dependencies") - void testOverWriteRelease(UnpackDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testOverWriteRelease(UnpackDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact release = stubFactory.getReleaseArtifact(); @@ -143,8 +140,7 @@ class TestUnpackDependenciesMojo2 { @Test @InjectMojo(goal = "unpack-dependencies") - void testDontOverWriteSnap(UnpackDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testDontOverWriteSnap(UnpackDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact snap = stubFactory.getSnapshotArtifact(); @@ -165,8 +161,7 @@ class TestUnpackDependenciesMojo2 { @Test @InjectMojo(goal = "unpack-dependencies") - void testOverWriteSnap(UnpackDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testOverWriteSnap(UnpackDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact snap = stubFactory.getSnapshotArtifact(); @@ -187,8 +182,7 @@ class TestUnpackDependenciesMojo2 { @Test @InjectMojo(goal = "unpack-dependencies") - void testOverWriteIfNewer(UnpackDependenciesMojo mojo) - throws MojoExecutionException, InterruptedException, IOException, MojoFailureException { + void testOverWriteIfNewer(UnpackDependenciesMojo mojo) throws Exception { Set<Artifact> artifacts = new HashSet<>(); Artifact snap = stubFactory.getSnapshotArtifact(); diff --git a/src/test/java/org/apache/maven/plugins/dependency/pom/PomEditorTest.java b/src/test/java/org/apache/maven/plugins/dependency/pom/PomEditorTest.java index e6a9f4a0..cff8923d 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/pom/PomEditorTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/pom/PomEditorTest.java @@ -177,7 +177,7 @@ class PomEditorTest { } @Test - void addDependencyToEmptyProject() throws IOException { + void addDependencyToEmptyProject() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -201,7 +201,7 @@ class PomEditorTest { } @Test - void addDependencyToExistingDependencies() throws IOException { + void addDependencyToExistingDependencies() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -233,7 +233,7 @@ class PomEditorTest { } @Test - void addDependencyToManagedSection() throws IOException { + void addDependencyToManagedSection() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -255,7 +255,7 @@ class PomEditorTest { } @Test - void addDependencyWithoutVersion() throws IOException { + void addDependencyWithoutVersion() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -281,7 +281,7 @@ class PomEditorTest { } @Test - void findExistingDependency() throws IOException { + void findExistingDependency() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -308,7 +308,7 @@ class PomEditorTest { } @Test - void removeDependency() throws IOException { + void removeDependency() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -342,7 +342,7 @@ class PomEditorTest { } @Test - void removeNonexistentDependencyReturnsFalse() throws IOException { + void removeNonexistentDependencyReturnsFalse() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -366,7 +366,7 @@ class PomEditorTest { } @Test - void preservesXmlComments() throws IOException { + void preservesXmlComments() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -395,7 +395,7 @@ class PomEditorTest { } @Test - void addBomDependency() throws IOException { + void addBomDependency() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -420,7 +420,7 @@ class PomEditorTest { } @Test - void addDependencyWithNamespacedPom() throws IOException { + void addDependencyWithNamespacedPom() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project xmlns=\"http://maven.apache.org/POM/4.0.0\"\n" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" @@ -457,7 +457,7 @@ class PomEditorTest { } @Test - void addOptionalDependency() throws IOException { + void addOptionalDependency() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -479,7 +479,7 @@ class PomEditorTest { } @Test - void pomWithoutXmlDeclaration() throws IOException { + void pomWithoutXmlDeclaration() throws Exception { String pom = "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" + " <groupId>com.example</groupId>\n" @@ -500,7 +500,7 @@ class PomEditorTest { } @Test - void removeWithPrecedingComment() throws IOException { + void removeWithPrecedingComment() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -535,7 +535,7 @@ class PomEditorTest { } @Test - void preservesBom() throws IOException { + void preservesBom() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" @@ -566,7 +566,7 @@ class PomEditorTest { } @Test - void findDependencyByTypeAndClassifier() throws IOException { + void findDependencyByTypeAndClassifier() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -603,7 +603,7 @@ class PomEditorTest { } @Test - void removeDependencyByTypeAndClassifier() throws IOException { + void removeDependencyByTypeAndClassifier() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -634,7 +634,7 @@ class PomEditorTest { } @Test - void findDependencyWithClassifier() throws IOException { + void findDependencyWithClassifier() throws Exception { String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -666,7 +666,7 @@ class PomEditorTest { } @Test - void rejectsNonProjectRootElement() throws IOException { + void rejectsNonProjectRootElement() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<settings>\n" + " <localRepository>/tmp/repo</localRepository>\n" @@ -677,7 +677,7 @@ class PomEditorTest { } @Test - void rejectsDoctypeDeclaration() throws IOException { + void rejectsDoctypeDeclaration() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!DOCTYPE project [\n" + " <!ENTITY xxe \"malicious\">\n" @@ -690,7 +690,7 @@ class PomEditorTest { } @Test - void rejectsDoctypeDeclarationCaseInsensitive() throws IOException { + void rejectsDoctypeDeclarationCaseInsensitive() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<!doctype project [\n" + " <!entity xxe \"malicious\">\n" @@ -703,7 +703,7 @@ class PomEditorTest { } @Test - void bomPrefixedFilePreservesXmlDeclaration() throws IOException { + void bomPrefixedFilePreservesXmlDeclaration() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <groupId>com.example</groupId>\n" @@ -735,7 +735,7 @@ class PomEditorTest { } @Test - void addDependencyIgnoresEmptyStringFields() throws IOException { + void addDependencyIgnoresEmptyStringFields() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies/>\n" + "</project>\n"; File pomFile = new File(tempDir, "pom.xml"); @@ -758,7 +758,7 @@ class PomEditorTest { } @Test - void addDependencyToExistingProfileWithNoDeps() throws IOException { + void addDependencyToExistingProfileWithNoDeps() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -792,7 +792,7 @@ class PomEditorTest { } @Test - void addDependencyToExistingProfile() throws IOException { + void addDependencyToExistingProfile() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <profiles>\n" @@ -825,7 +825,7 @@ class PomEditorTest { } @Test - void removeDependencyFromProfile() throws IOException { + void removeDependencyFromProfile() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -861,7 +861,7 @@ class PomEditorTest { } @Test - void findDependencyInProfileDoesNotFindTopLevel() throws IOException { + void findDependencyInProfileDoesNotFindTopLevel() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies>\n" @@ -885,7 +885,7 @@ class PomEditorTest { } @Test - void findProfileReturnsNullForNonexistent() throws IOException { + void findProfileReturnsNullForNonexistent() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <profiles>\n" @@ -903,7 +903,7 @@ class PomEditorTest { } @Test - void findProfileReturnsNullWhenNoProfilesSection() throws IOException { + void findProfileReturnsNullWhenNoProfilesSection() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <dependencies/>\n" + "</project>\n"; File pomFile = new File(tempDir, "pom.xml"); @@ -914,7 +914,7 @@ class PomEditorTest { } @Test - void addManagedDependencyToProfile() throws IOException { + void addManagedDependencyToProfile() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <profiles>\n" @@ -939,7 +939,7 @@ class PomEditorTest { } @Test - void removeDependencyWhenSectionAbsentReturnsFalse() throws IOException { + void removeDependencyWhenSectionAbsentReturnsFalse() throws Exception { String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n" diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsArtifactFilterTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsArtifactFilterTest.java index 0c4e7dc4..4c4dd8a8 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsArtifactFilterTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ExcludeReactorProjectsArtifactFilterTest.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -51,7 +50,7 @@ class ExcludeReactorProjectsArtifactFilterTest { private MavenProject project; @Test - void testFilter() throws ArtifactFilterException { + void testFilter() throws Exception { Artifact artifact1 = anArtifact("maven-dependency-plugin-dummy"); Artifact artifact2 = anArtifact("maven-dependency-plugin-other-dummy"); @@ -72,7 +71,7 @@ class ExcludeReactorProjectsArtifactFilterTest { } @Test - void testFilterWithLogging() throws ArtifactFilterException { + void testFilterWithLogging() throws Exception { Artifact artifact = anArtifact("maven-dependency-plugin-dummy"); when(project.getArtifact()).thenReturn(artifact); diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java index f55e21a9..00ac5b9f 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java @@ -56,13 +56,13 @@ class ResolveDependenciesMojoTest { } @Test - void testDependencyStatusLog() throws IOException { + void testDependencyStatusLog() throws Exception { Set<Artifact> artifacts = this.stubFactory.getMixedArtifacts(); doTestDependencyStatusLog(artifacts); } @Test - void testDependencyStatusLogNullFiles() throws IOException { + void testDependencyStatusLogNullFiles() throws Exception { this.stubFactory.setCreateFiles(false); Set<Artifact> artifacts = this.stubFactory.getMixedArtifacts(); doTestDependencyStatusLog(artifacts); @@ -74,7 +74,7 @@ class ResolveDependenciesMojoTest { } @Test - void testOptionalDependencyFormatting() throws IOException { + void testOptionalDependencyFormatting() throws Exception { Set<Artifact> set = new HashSet<>(); Artifact artifact = stubFactory.createArtifact("g", "a", VersionRange.createFromVersion("1.0"), "test", "jar", null, true); @@ -87,7 +87,7 @@ class ResolveDependenciesMojoTest { } @Test - void testModuleInfoIsAppendedToResolvedJars() throws IOException { + void testModuleInfoIsAppendedToResolvedJars() throws Exception { assumeTrue(hasModuleSystem(), "module names need Java 9 or later"); ResolveDependenciesMojo mojo = newMojo(new DependencyStatusSets()); mojo.outputFile = new File(tempDir, "list.txt"); @@ -100,7 +100,7 @@ class ResolveDependenciesMojoTest { } @Test - void testModuleInfoCanBeSwitchedOff() throws IOException { + void testModuleInfoCanBeSwitchedOff() throws Exception { assumeTrue(hasModuleSystem(), "module names need Java 9 or later"); ResolveDependenciesMojo mojo = newMojo(new DependencyStatusSets()); mojo.outputFile = new File(tempDir, "list.txt"); diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/DependencySizesTest.java b/src/test/java/org/apache/maven/plugins/dependency/tree/DependencySizesTest.java index 595902d7..6ece2d68 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/DependencySizesTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/DependencySizesTest.java @@ -19,7 +19,6 @@ package org.apache.maven.plugins.dependency.tree; import java.io.File; -import java.io.IOException; import java.io.StringWriter; import java.nio.file.Files; import java.util.Arrays; @@ -221,7 +220,7 @@ class DependencySizesTest { } @Test - void systemScopeUsesTheSystemPathNotTheResolver(@TempDir File dir) throws IOException { + void systemScopeUsesTheSystemPathNotTheResolver(@TempDir File dir) throws Exception { File jar = new File(dir, "system.jar"); Files.write(jar.toPath(), new byte[123]); DependencyNode system = node(root, "system", "1.0"); diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java index c82c45f0..39b81905 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java @@ -21,7 +21,6 @@ package org.apache.maven.plugins.dependency.tree; import javax.inject.Inject; import java.io.File; -import java.io.IOException; import java.io.OutputStreamWriter; import java.io.StringReader; import java.io.StringWriter; @@ -276,7 +275,7 @@ class TestTreeMojo { * Test the JSON format serialization on DependencyNodes with circular dependence */ @Test - void testTreeJsonCircularDependency() throws IOException { + void testTreeJsonCircularDependency() throws Exception { File outputFile = new File(tempDir, "tree1.json"); Files.createDirectories(outputFile.getParentFile().toPath()); outputFile.createNewFile(); diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/ArtifactCoordinatesTest.java b/src/test/java/org/apache/maven/plugins/dependency/utils/ArtifactCoordinatesTest.java index c1ca55f4..922a07ad 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/ArtifactCoordinatesTest.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/ArtifactCoordinatesTest.java @@ -20,12 +20,13 @@ package org.apache.maven.plugins.dependency.utils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class ArtifactCoordinatesTest { @@ -67,7 +68,7 @@ class ArtifactCoordinatesTest { } @ParameterizedTest - @CsvSource({"LATEST", "RELEASE", "'[1.0,2.0)'", "'(,2.0]'"}) + @ValueSource(strings = {"LATEST", "RELEASE", "[1.0,2.0)", "(,2.0]"}) void versionKeywordsAndRangesAreVersions(String version) { assertCoordinates("g:a:jar:" + version, version, "jar", null); assertCoordinates("g:a:" + version + ":jar", version, "jar", null); @@ -100,7 +101,7 @@ class ArtifactCoordinatesTest { }) void ambiguousOrMalformedStringsAreRejected(String artifact) { IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> parse(artifact)); - assertEquals(true, e.getMessage().startsWith("Invalid artifact format: " + artifact), e.getMessage()); + assertTrue(e.getMessage().startsWith("Invalid artifact format: " + artifact), e.getMessage()); } @Test @@ -155,7 +156,7 @@ class ArtifactCoordinatesTest { void theMavenFormRejectsEmptyTypeAndVersion() { for (String artifact : new String[] {"g:a::1.0", "g:a::cls:1.0", "g:a::1.0:test", "g:a::cls:1.0:test"}) { IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> parse(artifact), artifact); - assertEquals(true, e.getMessage().startsWith("Invalid artifact format: " + artifact), e.getMessage()); + assertTrue(e.getMessage().startsWith("Invalid artifact format: " + artifact), e.getMessage()); } } @@ -197,14 +198,14 @@ class ArtifactCoordinatesTest { void sixPartsThatFitNeitherFormAreRejected(String artifact) { IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> parseWithDestFileName(artifact)); - assertEquals(true, e.getMessage().contains("[:classifier[:destFileName]]"), e.getMessage()); + assertTrue(e.getMessage().contains("[:classifier[:destFileName]]"), e.getMessage()); } @Test void theLegacyFormWithoutDestFileNameKeepsItsOwnMessage() { IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> parse("g:a:1.0:jar:cls:renamed.jar")); - assertEquals(false, e.getMessage().contains("destFileName"), e.getMessage()); + assertFalse(e.getMessage().contains("destFileName"), e.getMessage()); } @Test
