This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch clean1 in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 838231440273f9ca6493fbdded8a16f207172025 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Dec 21 14:37:38 2025 +0100 Cleanup tests Co-authored-by: Moderne <[email protected]> --- .../plugin/plugin/report/GoalRendererTest.java | 4 ++-- .../EnhancedPluginDescriptorBuilderTest.java | 20 ++++++++++---------- .../annotations/ClassVersionComparatorTest.java | 2 +- .../JavaAnnotationsMojoDescriptorExtractorTest.java | 11 ++++------- .../converter/JavaClassConverterContextTest.java | 10 +++++----- .../JavadocBlockTagsToXhtmlConverterTest.java | 4 ++-- .../JavadocInlineTagsToXhtmlConverterTest.java | 20 ++++++++++---------- .../annotations/converter/tag/LinkUtilsTest.java | 4 ++-- .../scanner/DefaultMojoAnnotationsScannerTest.java | 10 ++++------ .../maven/tools/plugin/extractor/GroupKeyTest.java | 4 ++-- .../plugin/javadoc/JavadocLinkGeneratorTest.java | 13 ++++++------- .../tools/plugin/javadoc/JavadocNonLtsSiteIT.java | 17 ++++++++--------- .../tools/plugin/javadoc/JavadocReferenceTest.java | 3 +-- .../maven/tools/plugin/javadoc/JavadocSiteIT.java | 9 ++++----- .../maven/tools/plugin/javadoc/JavadocSiteTest.java | 21 ++++++++------------- .../plugin/scanner/DefaultMojoScannerTest.java | 10 +++++----- .../maven/tools/plugin/util/PluginUtilsTest.java | 9 ++++----- .../plugin/generator/AbstractGeneratorTestCase.java | 2 +- .../tools/plugin/generator/GeneratorUtilsTest.java | 4 ++-- .../generator/HtmlToPlainTextConverterTest.java | 10 +++++----- .../PluginDescriptorFilesGeneratorTest.java | 5 ++--- 21 files changed, 88 insertions(+), 104 deletions(-) diff --git a/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugin/plugin/report/GoalRendererTest.java b/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugin/plugin/report/GoalRendererTest.java index d1e9b5ff..12ad1911 100644 --- a/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugin/plugin/report/GoalRendererTest.java +++ b/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugin/plugin/report/GoalRendererTest.java @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class GoalRendererTest { @Test - void testGetShortType() { + void getShortType() { assertEquals("String", GoalRenderer.getShortType("java.lang.String")); assertEquals("List<String>", GoalRenderer.getShortType("java.util.List<java.lang.String>")); assertEquals( @@ -38,7 +38,7 @@ class GoalRendererTest { } @Test - void testGetXhtmlWithValidatedLinks() { + void getXhtmlWithValidatedLinks() { File baseDir = new File(this.getClass().getResource("").getFile()); GoalRenderer renderer = new GoalRenderer(null, null, Locale.ROOT, null, null, baseDir, false, new SystemStreamLog()); diff --git a/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilderTest.java b/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilderTest.java index ca4ede9c..c2d825b2 100644 --- a/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilderTest.java +++ b/maven-plugin-report-plugin/src/test/java/org/apache/maven/plugins/plugin/descriptor/EnhancedPluginDescriptorBuilderTest.java @@ -18,7 +18,6 @@ */ package org.apache.maven.plugins.plugin.descriptor; -import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.net.URI; @@ -28,23 +27,24 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.tools.plugin.EnhancedParameterWrapper; -import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.util.xml.XmlStreamReader; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class EnhancedPluginDescriptorBuilderTest { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +class EnhancedPluginDescriptorBuilderTest { @Test - void testTypeJavaDocUrlElement() throws PlexusConfigurationException, IOException { + void typeJavaDocUrlElement() throws Exception { EnhancedPluginDescriptorBuilder builder = new EnhancedPluginDescriptorBuilder(false); try (InputStream input = Objects.requireNonNull(this.getClass().getResourceAsStream("/plugin-enhanced.xml")); Reader reader = new XmlStreamReader(input)) { PluginDescriptor descriptor = builder.build(reader); MojoDescriptor mojoDescriptor = descriptor.getMojo("format-xml"); - Assertions.assertNotNull(mojoDescriptor); + assertNotNull(mojoDescriptor); EnhancedParameterWrapper enhancedParameter = assertEnhancedParameter(mojoDescriptor, "excludes"); - Assertions.assertEquals(URI.create("apidocs/java/util/Set.html"), enhancedParameter.getTypeJavadocUrl()); + assertEquals(URI.create("apidocs/java/util/Set.html"), enhancedParameter.getTypeJavadocUrl()); assertParameter(mojoDescriptor, "enableForIncrementalBuild"); // primitive types don't have javadoc } } @@ -67,12 +67,12 @@ public class EnhancedPluginDescriptorBuilderTest { Parameter parameterFromMap = mojoDescriptor.getParameterMap().get(parameterName); assertParameter(parameterFromMap, isEnhancedParameter); // check that both are equal - Assertions.assertEquals(parameter, parameterFromMap); + assertEquals(parameter, parameterFromMap); return parameter; } void assertParameter(Parameter parameter, boolean isEnhhancedParameter) { - Assertions.assertNotNull(parameter); - Assertions.assertEquals(isEnhhancedParameter, parameter instanceof EnhancedParameterWrapper); + assertNotNull(parameter); + assertEquals(isEnhhancedParameter, parameter instanceof EnhancedParameterWrapper); } } diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/ClassVersionComparatorTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/ClassVersionComparatorTest.java index 10d3a789..7460699d 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/ClassVersionComparatorTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/ClassVersionComparatorTest.java @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class ClassVersionComparatorTest { @Test - void testComparator() { + void comparator() { Comparator<Integer> comparator = new JavaAnnotationsMojoDescriptorExtractor.ClassVersionComparator(); assertEquals(0, Integer.signum(comparator.compare(Opcodes.V10, Opcodes.V10))); assertEquals(1, Integer.signum(comparator.compare(Opcodes.V11, Opcodes.V10))); diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java index f5713f13..10d48ae3 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractorTest.java @@ -52,8 +52,7 @@ class JavaAnnotationsMojoDescriptorExtractorTest { mojoClass.getResource(mojoClass.getSimpleName() + ".class").toURI()); Files.copy(sourceClass, targetDir.resolve(sourceClass.getFileName())); JavaAnnotationsMojoDescriptorExtractor mojoDescriptorExtractor = new JavaAnnotationsMojoDescriptorExtractor(); - DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner(); - mojoDescriptorExtractor.mojoAnnotationsScanner = scanner; + mojoDescriptorExtractor.mojoAnnotationsScanner = new DefaultMojoAnnotationsScanner(); PluginDescriptor pluginDescriptor = new PluginDescriptor(); MavenProject mavenProject = new MavenProject(); Artifact artifact = new DefaultArtifact("groupId", "artifactId", "1.0.0", null, "jar", "classifier", null); @@ -67,7 +66,7 @@ class JavaAnnotationsMojoDescriptorExtractorTest { } @Test - void assertFooMojo() throws InvalidPluginDescriptorException, ExtractionException, IOException, URISyntaxException { + void assertFooMojo() throws Exception { MojoDescriptor mojoDescriptor = extractDescriptorFromMojoClass(FooMojo.class); assertEquals("package", mojoDescriptor.getExecutePhase()); assertEquals("compiler", mojoDescriptor.getExecuteGoal()); @@ -75,8 +74,7 @@ class JavaAnnotationsMojoDescriptorExtractorTest { } @Test - void assertExecuteMojo() - throws InvalidPluginDescriptorException, ExtractionException, IOException, URISyntaxException { + void assertExecuteMojo() throws Exception { MojoDescriptor mojoDescriptor = extractDescriptorFromMojoClass(ExecuteMojo.class); assertEquals("my-phase-id", mojoDescriptor.getExecutePhase()); assertEquals("compiler", mojoDescriptor.getExecuteGoal()); @@ -84,8 +82,7 @@ class JavaAnnotationsMojoDescriptorExtractorTest { } @Test - void assertExecute2Mojo() - throws InvalidPluginDescriptorException, ExtractionException, IOException, URISyntaxException { + void assertExecute2Mojo() { // two conflicting phase ids set assertThrows(InvalidPluginDescriptorException.class, () -> extractDescriptorFromMojoClass(Execute2Mojo.class)); } diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java index 35967100..579fff05 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavaClassConverterContextTest.java @@ -66,7 +66,7 @@ class JavaClassConverterContextTest { } @Test - void testResolveReference() throws URISyntaxException { + void resolveReference() throws Exception { // test fully qualified unresolvable reference assertThrows( IllegalArgumentException.class, @@ -110,7 +110,7 @@ class JavaClassConverterContextTest { } @Test - void testResolveReferenceWithMembers() { + void resolveReferenceWithMembers() { // field assertEquals( new FullyQualifiedJavadocReference( @@ -196,7 +196,7 @@ class JavaClassConverterContextTest { } @Test - void testGetUrl() throws URISyntaxException { + void getUrl() throws Exception { MojoAnnotationContent mojoAnnotationContent = new MojoAnnotationContent(); mojoAnnotationContent.name("other-goal"); MojoAnnotatedClass mojoAnnotatedClass = new MojoAnnotatedClass().setMojo(mojoAnnotationContent); @@ -276,7 +276,7 @@ class JavaClassConverterContextTest { } @Test - void testClassContext() { + void classContext() { assertTrue( context.isReferencedBy(new FullyQualifiedJavadocReference(currentPackageName, "CurrentClass", false))); assertTrue(context.isReferencedBy(new FullyQualifiedJavadocReference(currentPackageName, "SuperClass", false))); @@ -291,7 +291,7 @@ class JavaClassConverterContextTest { } @Test - void testGetStaticFieldValue() { + void getStaticFieldValue() { assertEquals( "\"STATIC 1\"", context.getStaticFieldValue(new FullyQualifiedJavadocReference( diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java index a142c0f1..8375d97e 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocBlockTagsToXhtmlConverterTest.java @@ -45,7 +45,7 @@ class JavadocBlockTagsToXhtmlConverterTest { } @Test - void testSee() { + void see() { assertEquals( "<br /><strong>See also:</strong> \"Some reference\"", converter.convert("see", "\"Some reference\"", context)); @@ -62,7 +62,7 @@ class JavadocBlockTagsToXhtmlConverterTest { } @Test - void testExceptionInTag() { + void exceptionInTag() { URI baseUrl = URI.create("https://javadoc.example.com/";); ConverterContext context = new SimpleConverterContext("my.package", baseUrl) { @Override diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocInlineTagsToXhtmlConverterTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocInlineTagsToXhtmlConverterTest.java index 885d832b..07f055df 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocInlineTagsToXhtmlConverterTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/JavadocInlineTagsToXhtmlConverterTest.java @@ -56,7 +56,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testComplexJavadoc() { + void complexJavadoc() { String test = "This is a {@code <>code} and {@link package.Class#member} test {@code code2}\nsome other text"; assertEquals( "This is a <code><>code</code> and <a href=\"https://javadoc.example.com/package/Class.html#member\";><code>package.Class.member</code></a> test <code>code2</code> some other text", @@ -64,7 +64,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testCode() { + void code() { String test = "{@code text}"; assertEquals("<code>text</code>", converter.convert(test, context)); @@ -79,7 +79,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testLiteral() { + void literal() { String test = "{@literal text}"; assertEquals("text", converter.convert(test, context)); @@ -91,7 +91,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testLink() { + void link() { String test = "{@link Class}"; assertEquals( "<a href=\"https://javadoc.example.com/my/package/Class.html\";><code>Class</code></a>", @@ -104,7 +104,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testLinkplain() { + void linkplain() { String test = "{@linkplain Class}"; assertEquals( "<a href=\"https://javadoc.example.com/my/package/Class.html\";>Class</a>", @@ -152,20 +152,20 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testValue() { + void value() { String test = "{@value Class#STATIC_FIELD}"; assertEquals("some field value", converter.convert(test, context)); } @Test - void testDocroot() { + void docroot() { String test = "Some <a href=\"{@docRoot}/test.html\">link</a>"; assertEquals( "Some <a href=\"https://javadoc.example.com/test.html\";>link</a>", converter.convert(test, context)); } @Test - void testMultipleTags() { + void multipleTags() { String test = "Some code {@code myCode} and link {@linkplain Class}. Something"; assertEquals( "Some code <code>myCode</code> and link <a href=\"https://javadoc.example.com/my/package/Class.html\";>Class</a>. Something", @@ -173,7 +173,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testExceptionInTag() { + void exceptionInTag() { URI baseUrl = URI.create("https://javadoc.example.com/";); ConverterContext context = new SimpleConverterContext("my.package", baseUrl) { @@ -189,7 +189,7 @@ class JavadocInlineTagsToXhtmlConverterTest { } @Test - void testUnknownTag() { + void unknownTag() { String test = "{@unknown text}"; assertEquals("{@unknown text}<!-- unsupported tag 'unknown' -->", converter.convert(test, context)); } diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java index de0549ea..e187dff7 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/converter/tag/LinkUtilsTest.java @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class LinkUtilsTest { @Test - void testCreateUnresolvableLink() { + void createUnresolvableLink() { JavadocReference reference = JavadocReference.parse("Unresolvable"); ConverterContext context = new SimpleConverterContext("myPackage", (ref) -> URI.create(""), reference); assertEquals( @@ -37,7 +37,7 @@ class LinkUtilsTest { } @Test - void testCreateLinkWithNoJavadoc() { + void createLinkWithNoJavadoc() { ConverterContext context = new SimpleConverterContext("myPackage", (ref) -> { throw new IllegalArgumentException("Could not get javadoc"); }); diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java index a0f7b6b0..09e92f50 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java @@ -19,7 +19,6 @@ package org.apache.maven.tools.plugin.extractor.annotations.scanner; import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -30,7 +29,6 @@ import org.apache.maven.plugins.annotations.Execute; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; -import org.apache.maven.tools.plugin.extractor.ExtractionException; import org.apache.maven.tools.plugin.extractor.annotations.AbstractFooMojo; import org.apache.maven.tools.plugin.extractor.annotations.DeprecatedMojo; import org.apache.maven.tools.plugin.extractor.annotations.FooMojo; @@ -49,17 +47,17 @@ class DefaultMojoAnnotationsScannerTest { private DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner(); @Test - void testSkipModuleInfoClassInArchive() throws Exception { + void skipModuleInfoClassInArchive() throws Exception { scanner.scanArchive(new File("target/test-classes/java9-module.jar"), null, false); } @Test - void testJava8Annotations() throws Exception { + void java8Annotations() throws Exception { scanner.scanArchive(new File("target/test-classes/java8-annotations.jar"), null, false); } @Test - void scanDeprecatedMojoAnnotatins() throws ExtractionException, IOException { + void scanDeprecatedMojoAnnotatins() throws Exception { File directoryToScan = new File(DeprecatedMojo.class.getResource("").getFile()); Map<String, MojoAnnotatedClass> result = @@ -85,7 +83,7 @@ class DefaultMojoAnnotationsScannerTest { } @Test - void scanParametersWithGenerics() throws ExtractionException, IOException { + void scanParametersWithGenerics() throws Exception { File directoryToScan = new File(ParametersWithGenericsMojo.class.getResource("").getFile()); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/extractor/GroupKeyTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/extractor/GroupKeyTest.java index 63bbb726..32490940 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/extractor/GroupKeyTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/extractor/GroupKeyTest.java @@ -28,9 +28,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; /** * UT for {@link GroupKey}. */ -public class GroupKeyTest { +class GroupKeyTest { @Test - public void sortOrder() { + void sortOrder() { TreeSet<GroupKey> groupKeys = new TreeSet<>(); groupKeys.add(new GroupKey("ant", 1)); groupKeys.add(new GroupKey("bsh", 1)); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocLinkGeneratorTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocLinkGeneratorTest.java index 8c6fbe79..7a8be332 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocLinkGeneratorTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocLinkGeneratorTest.java @@ -19,7 +19,6 @@ package org.apache.maven.tools.plugin.javadoc; import java.net.URI; -import java.net.URISyntaxException; import java.util.Collections; import java.util.Map; @@ -36,9 +35,9 @@ class JavadocLinkGeneratorTest { @ParameterizedTest @MethodSource("org.apache.maven.tools.plugin.javadoc.JavadocSiteTest#jdkNamesAndVersions") - void testCreateLinkFromFullyQualifiedJavadocReference( + void createLinkFromFullyQualifiedJavadocReference( String jdkName, JavadocLinkGenerator.JavadocToolVersionRange versionRange, String version) - throws URISyntaxException { + throws Exception { URI javadocBaseUri = getClass().getResource("/javadoc/" + jdkName + "/").toURI(); JavadocLinkGenerator linkGenerator = new JavadocLinkGenerator(javadocBaseUri, version); // invalid link (must not throw exceptions for internal links @@ -95,9 +94,9 @@ class JavadocLinkGeneratorTest { @ParameterizedTest @MethodSource("org.apache.maven.tools.plugin.javadoc.JavadocSiteTest#jdkNamesAndVersions") - void testCreateLinkFromBinaryName( + void createLinkFromBinaryName( String jdkName, JavadocLinkGenerator.JavadocToolVersionRange versionRange, String version) - throws URISyntaxException { + throws Exception { URI javadocBaseUri = getClass().getResource("/javadoc/" + jdkName + "/").toURI(); JavadocLinkGenerator linkGenerator = new JavadocLinkGenerator(javadocBaseUri, version); @@ -114,7 +113,7 @@ class JavadocLinkGeneratorTest { } @Test - void testGetMatchingJavadocToolVersionRange() { + void getMatchingJavadocToolVersionRange() { assertEquals( JavadocLinkGenerator.JavadocToolVersionRange.JDK7_OR_LOWER, JavadocLinkGenerator.JavadocToolVersionRange.findMatch(JavaVersion.parse("1.5.0"))); @@ -136,7 +135,7 @@ class JavadocLinkGeneratorTest { } @Test - void testInaccessibleBaseUri() throws URISyntaxException { + void inaccessibleBaseUri() { // construction fails as no valid site URL is given assertThrows( IllegalArgumentException.class, diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java index a3f398b7..424bea5c 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocNonLtsSiteIT.java @@ -18,7 +18,6 @@ */ package org.apache.maven.tools.plugin.javadoc; -import java.io.IOException; import java.net.URI; import java.util.stream.Stream; @@ -52,25 +51,25 @@ class JavadocNonLtsSiteIT extends JavadocSiteIT { @ParameterizedTest @MethodSource("javadocBaseUrls") - void testConstructors(URI javadocBaseUrl) throws IOException { - super.testConstructors(javadocBaseUrl); + void constructors(URI javadocBaseUrl) throws Exception { + super.constructors(javadocBaseUrl); } @ParameterizedTest @MethodSource("javadocBaseUrls") - void testMethods(URI javadocBaseUrl) throws IOException { - super.testMethods(javadocBaseUrl); + void methods(URI javadocBaseUrl) throws Exception { + super.methods(javadocBaseUrl); } @ParameterizedTest @MethodSource("javadocBaseUrls") - void testFields(URI javadocBaseUrl) throws IOException { - super.testFields(javadocBaseUrl); + void fields(URI javadocBaseUrl) throws Exception { + super.fields(javadocBaseUrl); } @ParameterizedTest @MethodSource("javadocBaseUrls") - void testNestedClass(URI javadocBaseUrl) throws IOException { - super.testNestedClass(javadocBaseUrl); + void nestedClass(URI javadocBaseUrl) throws Exception { + super.nestedClass(javadocBaseUrl); } } diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReferenceTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReferenceTest.java index 8bd1a7b1..be3cea5c 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReferenceTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReferenceTest.java @@ -18,7 +18,6 @@ */ package org.apache.maven.tools.plugin.javadoc; -import java.net.URISyntaxException; import java.util.Optional; import org.junit.jupiter.api.Test; @@ -28,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class JavadocReferenceTest { @Test - void testParse() throws URISyntaxException { + void parse() throws Exception { assertEquals( new JavadocReference(Optional.empty(), Optional.empty(), Optional.of("member"), Optional.empty()), JavadocReference.parse("#member")); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteIT.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteIT.java index 115bb982..dd603115 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteIT.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteIT.java @@ -18,7 +18,6 @@ */ package org.apache.maven.tools.plugin.javadoc; -import java.io.IOException; import java.net.URI; import java.util.stream.Stream; @@ -39,7 +38,7 @@ class JavadocSiteIT { @ParameterizedTest @MethodSource("javadocBaseUrls") - void testConstructors(URI javadocBaseUrl) throws IOException { + void constructors(URI javadocBaseUrl) throws Exception { JavadocSite site = new JavadocSite(javadocBaseUrl, null); JavadocSiteTest.assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "java.lang", "String", "String(byte[],int)", MemberType.CONSTRUCTOR, true))); @@ -47,7 +46,7 @@ class JavadocSiteIT { @ParameterizedTest @MethodSource("javadocBaseUrls") - void testMethods(URI javadocBaseUrl) throws IOException { + void methods(URI javadocBaseUrl) throws Exception { JavadocSite site = new JavadocSite(javadocBaseUrl, null); JavadocSiteTest.assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "java.lang", "String", "copyValueOf(char[],int,int)", MemberType.METHOD, true))); @@ -55,7 +54,7 @@ class JavadocSiteIT { @ParameterizedTest @MethodSource("javadocBaseUrls") - void testFields(URI javadocBaseUrl) throws IOException { + void fields(URI javadocBaseUrl) throws Exception { JavadocSite site = new JavadocSite(javadocBaseUrl, null); JavadocSiteTest.assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "java.lang", "String", "CASE_INSENSITIVE_ORDER", MemberType.FIELD, true))); @@ -63,7 +62,7 @@ class JavadocSiteIT { @ParameterizedTest @MethodSource("javadocBaseUrls") - void testNestedClass(URI javadocBaseUrl) throws IOException { + void nestedClass(URI javadocBaseUrl) throws Exception { JavadocSite site = new JavadocSite(javadocBaseUrl, null); JavadocSiteTest.assertUrlValid( site.createLink(new FullyQualifiedJavadocReference("java.util", "Map.Entry", true))); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java index 4355fb82..df37c599 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocSiteTest.java @@ -52,8 +52,7 @@ class JavadocSiteTest { @ParameterizedTest @MethodSource("jdkNamesAndVersions") - void testConstructorLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) - throws URISyntaxException, IOException { + void constructorLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) throws Exception { JavadocSite site = getLocalJavadocSite(jdkName, version); assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "org.apache.maven.tools.plugin.extractor.annotations.converter.test", @@ -65,8 +64,7 @@ class JavadocSiteTest { @ParameterizedTest @MethodSource("jdkNamesAndVersions") - void testMethodLinks(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) - throws URISyntaxException, IOException { + void methodLinks(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) throws Exception { JavadocSite site = getLocalJavadocSite(jdkName, version); // test generics signature assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( @@ -86,8 +84,7 @@ class JavadocSiteTest { @ParameterizedTest @MethodSource("jdkNamesAndVersions") - void testFieldLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) - throws URISyntaxException, IOException { + void fieldLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) throws Exception { JavadocSite site = getLocalJavadocSite(jdkName, version); assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "org.apache.maven.tools.plugin.extractor.annotations.converter.test", @@ -99,8 +96,7 @@ class JavadocSiteTest { @ParameterizedTest @MethodSource("jdkNamesAndVersions") - void testPackageLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) - throws URISyntaxException, IOException { + void packageLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) throws Exception { JavadocSite site = getLocalJavadocSite(jdkName, version); assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "org.apache.maven.tools.plugin.extractor.annotations.converter.test", false))); @@ -108,15 +104,14 @@ class JavadocSiteTest { @ParameterizedTest @MethodSource("jdkNamesAndVersions") - void testClassLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) - throws URISyntaxException, IOException { + void classLink(String jdkName, JavadocLinkGenerator.JavadocToolVersionRange version) throws Exception { JavadocSite site = getLocalJavadocSite(jdkName, version); assertUrlValid(site.createLink(new FullyQualifiedJavadocReference( "org.apache.maven.tools.plugin.extractor.annotations.converter.test", "CurrentClass", false))); } @Test - void testGetPackageAndClassName() { + void getPackageAndClassName() { assertEquals( new AbstractMap.SimpleEntry<>("java.util", "Map"), JavadocSite.getPackageAndClassName(Map.class.getName())); @@ -139,7 +134,7 @@ class JavadocSiteTest { } static JavadocSite getLocalJavadocSite(String name, JavadocLinkGenerator.JavadocToolVersionRange version) - throws IOException, URISyntaxException { + throws URISyntaxException { URI javadocBaseUri = JavadocSiteTest.class.getResource("/javadoc/" + name + "/").toURI(); return new JavadocSite(javadocBaseUri, version, false); @@ -149,7 +144,7 @@ class JavadocSiteTest { try (BufferedReader reader = JavadocSite.getReader(url.toURL(), null)) { if (url.getFragment() != null) { Pattern pattern = JavadocSite.getAnchorPattern(url.getFragment()); - if (!reader.lines().anyMatch(pattern.asPredicate())) { + if (reader.lines().noneMatch(pattern.asPredicate())) { fail("Although URL " + url + " exists, no line matching the pattern " + pattern + " found in response"); } diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java index e3c0fdd1..8cece5a9 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java @@ -78,7 +78,7 @@ class DefaultMojoScannerTest { } @Test - void testUnspecifiedExtractors() throws Exception { + void unspecifiedExtractors() throws Exception { PluginDescriptor pluginDescriptor = createPluginDescriptor(); scanner.populatePluginDescriptor(new DefaultPluginToolsRequest(project, pluginDescriptor)); @@ -87,7 +87,7 @@ class DefaultMojoScannerTest { } @Test - void testSpecifiedExtractors() throws Exception { + void specifiedExtractors() throws Exception { Set<String> activeExtractors = new HashSet<>(); activeExtractors.add("one"); activeExtractors.add(""); @@ -103,7 +103,7 @@ class DefaultMojoScannerTest { } @Test - void testAllExtractorsThroughNull() throws Exception { + void allExtractorsThroughNull() throws Exception { PluginDescriptor pluginDescriptor = createPluginDescriptor(); scanner.setActiveExtractors(null); @@ -113,7 +113,7 @@ class DefaultMojoScannerTest { } @Test - void testNoExtractorsThroughEmptySet() throws Exception { + void noExtractorsThroughEmptySet() throws Exception { PluginDescriptor pluginDescriptor = createPluginDescriptor(); scanner.setActiveExtractors(Collections.emptySet()); @@ -128,7 +128,7 @@ class DefaultMojoScannerTest { } @Test - void testUnknownExtractor() throws Exception { + void unknownExtractor() throws Exception { Set<String> activeExtractors = new HashSet<>(); activeExtractors.add("four"); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java index bbd2081e..ca594cfe 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; */ class PluginUtilsTest { @Test - void testShouldTrimArtifactIdToFindPluginId() { + void shouldTrimArtifactIdToFindPluginId() { assertEquals("artifactId", PluginDescriptor.getGoalPrefixFromArtifactId("maven-artifactId-plugin")); assertEquals("artifactId", PluginDescriptor.getGoalPrefixFromArtifactId("maven-plugin-artifactId")); assertEquals("artifactId", PluginDescriptor.getGoalPrefixFromArtifactId("artifactId-maven-plugin")); @@ -43,7 +43,7 @@ class PluginUtilsTest { } @Test - void testShouldFindTwoScriptsWhenNoExcludesAreGiven() { + void shouldFindTwoScriptsWhenNoExcludesAreGiven() { String testScript = "test.txt"; String basedir = TestUtils.dirname(testScript); @@ -55,7 +55,7 @@ class PluginUtilsTest { } @Test - void testShouldFindOneScriptsWhenAnExcludeIsGiven() { + void shouldFindOneScriptsWhenAnExcludeIsGiven() { String testScript = "test.txt"; String basedir = TestUtils.dirname(testScript); @@ -68,11 +68,10 @@ class PluginUtilsTest { } @Test - void testIsMavenReport() throws Exception { + void isMavenReport() { try { PluginUtils.isMavenReport(null, null); } catch (IllegalArgumentException e) { - assertTrue(true); } String impl = "org.apache.maven.tools.plugin.util.stubs.MavenReportStub"; diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java index f592b631..f956391d 100644 --- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java +++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java @@ -47,7 +47,7 @@ public abstract class AbstractGeneratorTestCase { protected String basedir = System.getProperty("basedir"); @Test - public void testGenerator() throws Exception { + public void generator() throws Exception { setupGenerator(); MojoDescriptor mojoDescriptor = new MojoDescriptor(); diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/GeneratorUtilsTest.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/GeneratorUtilsTest.java index d0e10c8e..9095aded 100644 --- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/GeneratorUtilsTest.java +++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/GeneratorUtilsTest.java @@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ class GeneratorUtilsTest { @Test - void testShouldWriteDependencies() throws Exception { + void shouldWriteDependencies() { ComponentDependency dependency = new ComponentDependency(); dependency.setArtifactId("testArtifactId"); dependency.setGroupId("testGroupId"); @@ -183,7 +183,7 @@ class GeneratorUtilsTest { } @Test - void testExcludeProvidedScopeFormComponentDependencies() { + void excludeProvidedScopeFormComponentDependencies() { Artifact a1 = new DefaultArtifact("g", "a1", "1.0", Artifact.SCOPE_COMPILE, "jar", "", null); Artifact a2 = new DefaultArtifact("g", "a2", "2.0", Artifact.SCOPE_PROVIDED, "jar", "", null); diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverterTest.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverterTest.java index cd9afb45..9152b4f0 100644 --- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverterTest.java +++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/HtmlToPlainTextConverterTest.java @@ -31,7 +31,7 @@ class HtmlToPlainTextConverterTest { } @Test - void testConvertWithCodeAndLink() { + void convertWithCodeAndLink() { String test = "This is a <code>code</code> and <a href=\"https://javadoc.example.com/some/javadoc.html\";>Link</a>"; assertEquals( @@ -39,7 +39,7 @@ class HtmlToPlainTextConverterTest { } @Test - void testMultilineJavadocAndWordWrap() { + void multilineJavadocAndWordWrap() { String test = "Generates a <a href=\"https://jackrabbit.apache.org/jcr/node-type-notation.html\";>CND file</a> containing all\n" + "used node types and namespaces. It uses the <a href=\"https://s.apache.org/jcr-2.0-spec/3_Repository_Model.html#3.7.11%20Standard%20Application%20Node%20Types\";>default namespaces and node types</a>\n" @@ -53,18 +53,18 @@ class HtmlToPlainTextConverterTest { } @Test - void testRelativeUrl() { + void relativeUrl() { String test = "<a href=\"#field\">field</a>"; assertEquals("field", converter.convert(test)); } @Test - void testNullValue() { + void nullValue() { assertNull(converter.convert(null)); } @Test - void testExplicitNewline() { + void explicitNewline() { String test = "Some \"quotation\" marks and backslashes '\\\\', some <strong>important</strong> javadoc<br> and an\n" + "inline link to foo"; diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java index 45bc602f..a898899e 100644 --- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java +++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java @@ -25,7 +25,6 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.net.URI; -import java.net.URISyntaxException; import java.util.List; import org.apache.maven.plugin.descriptor.DuplicateParameterException; @@ -46,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author <a href="mailto:[email protected]";>Jason van Zyl </a> */ -public class PluginDescriptorFilesGeneratorTest extends AbstractGeneratorTestCase { +class PluginDescriptorFilesGeneratorTest extends AbstractGeneratorTestCase { @Override protected void extendPluginDescriptor(PluginDescriptor pluginDescriptor) throws DuplicateParameterException { Parameter parameterWithGenerics = new Parameter(); @@ -148,7 +147,7 @@ public class PluginDescriptorFilesGeneratorTest extends AbstractGeneratorTestCas } @Test - void testGetJavadocUrlForType() throws URISyntaxException { + void getJavadocUrlForType() throws Exception { URI javadocBaseUri = new URI("http://localhost/apidocs/";); JavadocLinkGenerator linkGenerator = new JavadocLinkGenerator(javadocBaseUri, "1.8"); assertEquals(
