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-shade-plugin.git
commit 8efafe3b2af5bc02f794f1efa6263d84f1368a1f Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 08:08:02 2026 +0000 Use JUnit 5 assertions and Mockito best practices in tests --- .../maven/plugins/shade/DefaultShaderTest.java | 17 +++++++++-------- .../plugins/shade/filter/MinijarFilterTest.java | 4 ++-- .../maven/plugins/shade/mojo/RelativizePathTest.java | 3 +-- .../relocation/SimpleRelocatorParameterTest.java | 3 +-- .../ApacheNoticeResourceTransformerTest.java | 20 ++++++++++---------- .../resource/IncludeResourceTransformerTest.java | 2 +- .../ResourceBundleAppendingTransformerTest.java | 2 +- .../resource/SisuIndexResourceTransformerTest.java | 2 +- .../shade/resource/XmlAppendingTransformerTest.java | 3 +-- .../properties/PropertiesTransformerTest.java | 3 +-- 10 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java index 73d8350..ed92555 100644 --- a/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java @@ -87,6 +87,7 @@ import static java.util.Objects.requireNonNull; import static org.codehaus.plexus.util.FileUtils.forceMkdir; 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; import static org.mockito.ArgumentMatchers.any; @@ -108,7 +109,7 @@ public class DefaultShaderTest { private static final String NEWLINE = "\n"; @Test - public void testNoopWhenNotRelocated() throws IOException, MojoExecutionException { + public void testNoopWhenNotRelocated() throws Exception { File plexusJar = new File("src/test/jars/plexus-utils-1.4.1.jar"); File shadedOutput = new File("target/foo-custom_testNoopWhenNotRelocated.jar"); @@ -162,7 +163,7 @@ public class DefaultShaderTest { } @Test - public void testOverlappingResourcesAreLogged() throws IOException, MojoExecutionException { + public void testOverlappingResourcesAreLogged() throws Exception { DefaultShader shader = newShader(); // we will shade two jars and expect to see META-INF/MANIFEST.MF overlaps, this will always be true @@ -286,7 +287,7 @@ public class DefaultShaderTest { .contains("Discovered module-info.class. Shading will break its strong encapsulation."), warnMessages.getAllValues().toString()); try (JarFile jar = new JarFile(shaded)) { - assertEquals(null, jar.getJarEntry("module-info.class")); + assertNull(jar.getJarEntry("module-info.class")); assertTrue(jar.getJarEntry("org/shaded/example/api/Api.class") != null); } } @@ -510,7 +511,7 @@ public class DefaultShaderTest { JarEntry entry = shadedJarFile.getJarEntry(innerJarFileName); // After shading, entry compression method should not be changed. - Assertions.assertEquals(entry.getMethod(), ZipEntry.STORED); + Assertions.assertEquals(ZipEntry.STORED, entry.getMethod()); temporaryFolder.delete(); } @@ -745,7 +746,7 @@ public class DefaultShaderTest { try (JarFile shadedJar = new JarFile(shadedFile)) { assertTrue(readModuleProviders(shadedJar, "module-info.class", "app.module", "spi/Service") .isEmpty()); - assertTrue(shadedJar.getJarEntry("META-INF/services/spi.Service") == null); + assertNull(shadedJar.getJarEntry("META-INF/services/spi.Service")); } temporaryFolder.delete(); @@ -1093,7 +1094,7 @@ public class DefaultShaderTest { assertEquals("true", shadedJar.getManifest().getMainAttributes().getValue("Multi-Release")); assertEquals( "app.module", shadedJar.getManifest().getMainAttributes().getValue("Automatic-Module-Name")); - assertTrue(shadedJar.getJarEntry("module-info.class") == null); + assertNull(shadedJar.getJarEntry("module-info.class")); assertTrue(shadedJar.getJarEntry("META-INF/versions/17/module-info.class") != null); assertTrue(shadedJar.getJarEntry("META-INF/versions/17/hidden/dep/versioned/LaterProvider.class") != null); @@ -1302,8 +1303,8 @@ public class DefaultShaderTest { readModulePackages(shadedJar, "META-INF/versions/17/module-info.class", "shaded.app.module")); assertTrue(shadedJar.getJarEntry("META-INF/versions/17/hidden/app/versioned/Feature.class") != null); assertTrue(shadedJar.getJarEntry("hidden/dep/api/Dependency.class") != null); - assertTrue(shadedJar.getJarEntry("META-INF/versions/17/app/versioned/Feature.class") == null); - assertTrue(shadedJar.getJarEntry("dep/api/Dependency.class") == null); + assertNull(shadedJar.getJarEntry("META-INF/versions/17/app/versioned/Feature.class")); + assertNull(shadedJar.getJarEntry("dep/api/Dependency.class")); } temporaryFolder.delete(); diff --git a/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java b/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java index 206ccf4..c7b4666 100644 --- a/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java @@ -72,7 +72,7 @@ public class MinijarFilterTest { * This test will fail on JDK 7 because jdependency needs at least JDK 8. */ @Test - public void testWithMockProject() throws IOException { + public void testWithMockProject() throws Exception { assumeFalse(System.getProperty("java.version").startsWith("1.7"), "Expected to run under JDK8+"); MavenProject mavenProject = mockProject(outputDirectory, emptyFile); @@ -87,7 +87,7 @@ public class MinijarFilterTest { } @Test - public void testWithPomProject() throws IOException { + public void testWithPomProject() throws Exception { // project with pom packaging and no artifact. MavenProject mavenProject = mockProject(outputDirectory, null); mavenProject.setPackaging("pom"); diff --git a/src/test/java/org/apache/maven/plugins/shade/mojo/RelativizePathTest.java b/src/test/java/org/apache/maven/plugins/shade/mojo/RelativizePathTest.java index dfc2ff6..dc46550 100644 --- a/src/test/java/org/apache/maven/plugins/shade/mojo/RelativizePathTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/mojo/RelativizePathTest.java @@ -19,7 +19,6 @@ package org.apache.maven.plugins.shade.mojo; import java.io.File; -import java.io.IOException; import org.junit.jupiter.api.Test; @@ -43,7 +42,7 @@ public class RelativizePathTest { static final String[] ANSWER = {"../pom", "b/pom", "../c/pom", "pom"}; @Test - public void runTests() throws IOException { + public void runTests() throws Exception { for (int x = 0; x < PARENTS.length; x++) { File parent = new File(PARENTS[x]).getCanonicalFile(); File child = new File(CHILDREN[x]).getCanonicalFile(); diff --git a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java index 271c647..f49350f 100644 --- a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorParameterTest.java @@ -21,7 +21,6 @@ package org.apache.maven.plugins.shade.relocation; import java.util.Collections; import org.apache.maven.plugins.shade.mojo.PackageRelocation; -import org.codehaus.plexus.component.configurator.ComponentConfigurationException; import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup; import org.codehaus.plexus.component.configurator.converters.lookup.DefaultConverterLookup; import org.codehaus.plexus.component.configurator.expression.DefaultExpressionEvaluator; @@ -52,7 +51,7 @@ public class SimpleRelocatorParameterTest { * An empty {@code <shadedPattern/>} in the POM reaches the relocator as {@code null}, which gives the default. */ @Test - public void testEmptyShadedPatternElementDefaultsToHiddenPrefix() throws ComponentConfigurationException { + public void testEmptyShadedPatternElementDefaultsToHiddenPrefix() throws Exception { PlexusConfiguration configuration = new DefaultPlexusConfiguration("configuration"); configuration.addChild("pattern", "org.example"); configuration.addChild("shadedPattern", ""); diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java index 81fe783..499d0b6 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java @@ -92,42 +92,42 @@ public class ApacheNoticeResourceTransformerTest { } @Test - public void testNoParametersShouldNotThrowNullPointerWhenNoInput() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenNoInput() throws Exception { processAndFailOnNullPointer(""); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenNoLinesOfInput() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenNoLinesOfInput() throws Exception { processAndFailOnNullPointer("Some notice text"); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenOneLineOfInput() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenOneLineOfInput() throws Exception { processAndFailOnNullPointer("Some notice text\n"); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenTwoLinesOfInput() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenTwoLinesOfInput() throws Exception { processAndFailOnNullPointer("Some notice text\nSome notice text\n"); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenLineStartsWithSlashSlash() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenLineStartsWithSlashSlash() throws Exception { processAndFailOnNullPointer("Some notice text\n//Some notice text\n"); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenLineIsSlashSlash() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenLineIsSlashSlash() throws Exception { processAndFailOnNullPointer("//\n"); } @Test - public void testNoParametersShouldNotThrowNullPointerWhenLineIsEmpty() throws IOException { + public void testNoParametersShouldNotThrowNullPointerWhenLineIsEmpty() throws Exception { processAndFailOnNullPointer("\n"); } @Test - public void testCopyrightYearEndsTheCopyrightLine() throws IOException { + public void testCopyrightYearEndsTheCopyrightLine() throws Exception { transformer.copyrightYear = "2019"; transformer.processResource( NOTICE_RESOURCE, new ByteArrayInputStream(new byte[0]), Collections.<Relocator>emptyList(), 0); @@ -138,7 +138,7 @@ public class ApacheNoticeResourceTransformerTest { } @Test - public void testDefaultCopyrightYearUsesGregorianCalendar() throws IOException { + public void testDefaultCopyrightYearUsesGregorianCalendar() throws Exception { Locale previousFormatLocale = Locale.getDefault(Locale.Category.FORMAT); try { Locale.setDefault(Locale.Category.FORMAT, Locale.forLanguageTag("th-TH")); @@ -165,7 +165,7 @@ public class ApacheNoticeResourceTransformerTest { } @Test - public void testGeneratedNoticeNamesTheProject() throws IOException { + public void testGeneratedNoticeNamesTheProject() throws Exception { transformer.setProjectNameIfUnset("Maven Shade Notice Reproducer"); transformer.processResource( NOTICE_RESOURCE, diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformerTest.java index 014ebbf..0cbc293 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformerTest.java @@ -45,7 +45,7 @@ class IncludeResourceTransformerTest { Path tempDir; @Test - void includesTheFile() throws IOException { + void includesTheFile() throws Exception { Path file = Files.write(tempDir.resolve("LICENSE"), "license text".getBytes(StandardCharsets.UTF_8)); IncludeResourceTransformer transformer = new IncludeResourceTransformer(); transformer.file = file.toFile(); diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformerTest.java index 43e2012..996e5ee 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformerTest.java @@ -64,7 +64,7 @@ public class ResourceBundleAppendingTransformerTest { * MSHADE-232: every locale variant of a bundle keeps the entries of all jars that provide it. */ @Test - public void testBundlesOfSeveralJarsAreMergedPerLocale() throws IOException { + public void testBundlesOfSeveralJarsAreMergedPerLocale() throws Exception { transformer.setBasename("org/apache/maven/plugins/shade/its/Message"); String base = "org/apache/maven/plugins/shade/its/Message.properties"; String dutch = "org/apache/maven/plugins/shade/its/Message_nl.properties"; diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java index ba01b19..3f2fd78 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/SisuIndexResourceTransformerTest.java @@ -55,7 +55,7 @@ public class SisuIndexResourceTransformerTest { * MSHADE-390: the index of every jar ends up in one index, with the class names relocated. */ @Test - public void testIndexesAreMergedAndRelocated() throws IOException { + public void testIndexesAreMergedAndRelocated() throws Exception { List<Relocator> relocators = Collections.singletonList(new SimpleRelocator( "org.apache.one", "org.apache.two.org.apache.one", null, Collections.<String>emptyList())); diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java index d3adb7e..2d50d29 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformerTest.java @@ -20,7 +20,6 @@ package org.apache.maven.plugins.shade.resource; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Locale; @@ -72,7 +71,7 @@ public class XmlAppendingTransformerTest { * The DOCTYPE of this document points at a DTD that does not exist: the transformer must not try to load it. */ @Test - public void testDtdIsNotResolved() throws IOException { + public void testDtdIsNotResolved() throws Exception { transformer.resource = "test.xml"; String xml = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" + "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"xhtml1-invalid.missing\">\n" diff --git a/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java b/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java index 6bc5573..2911e49 100644 --- a/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java +++ b/src/test/java/org/apache/maven/plugins/shade/resource/properties/PropertiesTransformerTest.java @@ -20,7 +20,6 @@ package org.apache.maven.plugins.shade.resource.properties; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.util.Properties; @@ -41,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(TransformerTesterRule.class) public class PropertiesTransformerTest { @Test - public void propertiesRewritingIsStable() throws IOException { + public void propertiesRewritingIsStable() throws Exception { final Properties properties = new SortedProperties(); properties.setProperty("a", "1"); properties.setProperty("b", "2");
