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-doxia-sitetools.git
The following commit(s) were added to refs/heads/master by this push:
new aeedef5 JUnit Jupiter best practices
aeedef5 is described below
commit aeedef515e46cf22ab8cb9cf95c06cb5e27ce213
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Nov 2 23:12:35 2025 +0000
JUnit Jupiter best practices
Co-authored-by: Moderne <[email protected]>
---
.../maven/doxia/tools/DefaultSiteToolTest.java | 12 ++---
.../org/apache/maven/doxia/tools/SiteToolTest.java | 24 +++++-----
.../org/apache/maven/doxia/site/SiteUtilsTest.java | 6 +--
.../SiteModelInheritanceAssemblerTest.java | 52 +++++++++++-----------
.../site/inheritance/URIPathDescriptorTest.java | 12 ++---
.../doxia/siterenderer/AttributesVerifier.java | 2 +-
.../siterenderer/DefaultSiteRendererTest.java | 23 +++++-----
.../maven/doxia/siterenderer/EntitiesVerifier.java | 4 +-
.../doxia/siterenderer/RenderingContextTest.java | 4 +-
9 files changed, 70 insertions(+), 69 deletions(-)
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
index ad5b8c1..f90bc65 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author <a href="mailto:[email protected]";>Vincent Siveton</a>
*/
-public class DefaultSiteToolTest {
+class DefaultSiteToolTest {
private DefaultSiteTool tool = new DefaultSiteTool();
@@ -37,7 +37,7 @@ public class DefaultSiteToolTest {
* test getNormalizedPath().
*/
@Test
- public void testGetNormalizedPath() {
+ void getNormalizedPath() {
assertNull(DefaultSiteTool.getNormalizedPath(null));
assertEquals("", DefaultSiteTool.getNormalizedPath(""));
assertEquals("", DefaultSiteTool.getNormalizedPath("."));
@@ -62,7 +62,7 @@ public class DefaultSiteToolTest {
@SuppressWarnings("deprecation")
@Test
- public void testGetRelativePath() {
+ void getRelativePath() {
assertEquals(
".." + File.separator + "bar.html",
tool.getRelativePath("http://example.com/foo/bar.html";,
"http://example.com/foo/baz.html";));
@@ -70,14 +70,14 @@ public class DefaultSiteToolTest {
@SuppressWarnings("deprecation")
@Test
- public void testGetRelativePath_same() {
+ void getRelativePathSame() {
assertTrue(tool.getRelativePath("http://example.com/foo/bar.html";,
"http://example.com/foo/bar.html";)
.isEmpty());
}
@SuppressWarnings("deprecation")
@Test
- public void testGetRelativePath_differentSchemes() {
+ void getRelativePathDifferentSchemes() {
assertEquals(
"scp://example.com/foo/bar.html",
tool.getRelativePath("scp://example.com/foo/bar.html",
"http://example.com/foo/bar.html";));
@@ -86,7 +86,7 @@ public class DefaultSiteToolTest {
@SuppressWarnings("deprecation")
@Test
- public void testGetRelativePath_differentDomains() {
+ void getRelativePathDifferentDomains() {
assertEquals(
"https://example.org/bar.html";,
tool.getRelativePath("https://example.org/bar.html";,
"https://example.com/bar.html";));
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index 55f67a6..6cd6a75 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -64,7 +64,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
@SuppressWarnings("javadoc")
@PlexusTest
-public class SiteToolTest {
+class SiteToolTest {
@Inject
private DefaultSiteTool tool;
@@ -89,7 +89,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetSkinArtifactFromRepository() throws Exception {
+ void getSkinArtifactFromRepository() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
@@ -112,7 +112,7 @@ public class SiteToolTest {
*/
@Test
@SuppressWarnings({"deprecation"})
- public void testGetRelativePath() throws Exception {
+ void getRelativePath() throws Exception {
assertNotNull(tool);
checkGetRelativePathDirectory(tool, "", "http://maven.apache.org";,
"http://maven.apache.org";);
@@ -197,7 +197,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetSiteDescriptorFromBasedir() throws Exception {
+ void getSiteDescriptorFromBasedir() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
@@ -294,7 +294,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetSiteDescriptorFromRepository() throws Exception {
+ void getSiteDescriptorFromRepository() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
@@ -319,7 +319,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetSiteModel() throws Exception {
+ void getSiteModel() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
@@ -373,7 +373,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetDefaultSiteModel() throws Exception {
+ void getDefaultSiteModel() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("no-site-test");
@@ -391,7 +391,7 @@ public class SiteToolTest {
}
@Test
- public void testGetAvailableLocales() throws Exception {
+ void getAvailableLocales() throws Exception {
assertEquals(Collections.singletonList(SiteTool.DEFAULT_LOCALE),
tool.getSiteLocales("default"));
assertEquals(
@@ -403,7 +403,7 @@ public class SiteToolTest {
}
@Test
- public void testGetInterpolatedSiteDescriptorContent() throws Exception {
+ void getInterpolatedSiteDescriptorContent() throws Exception {
assertNotNull(tool);
File pomXmlFile =
getTestFile("src/test/resources/unit/interpolated-site/pom.xml");
@@ -446,7 +446,7 @@ public class SiteToolTest {
// MSHARED-217 -> DOXIATOOLS-34 -> DOXIASITETOOLS-118
@Test
- public void testSiteModelInheritanceAndInterpolation() throws Exception {
+ void siteModelInheritanceAndInterpolation() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub parentProject = new
SiteToolMavenProjectStub("interpolation-parent-test");
@@ -506,7 +506,7 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testConvertOldToNewSiteModel() throws Exception {
+ void convertOldToNewSiteModel() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("old-to-new-site-model-conversion-test");
@@ -534,7 +534,7 @@ public class SiteToolTest {
}
@Test
- public void testRequireParent() throws SiteToolException, Exception {
+ void requireParent() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("require-parent-test");
diff --git
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
index d1f315c..2340f05 100644
---
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
+++
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
@@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class SiteUtilsTest {
+class SiteUtilsTest {
@Test
- public void testIsLink() {
+ void isLink() {
assertFalse(SiteUtils.isLink(null));
assertFalse(SiteUtils.isLink(""));
assertFalse(SiteUtils.isLink(" "));
@@ -41,7 +41,7 @@ public class SiteUtilsTest {
}
@Test
- public void testGetCustomChild() {
+ void getCustomChild() {
Xpp3Dom dom = new Xpp3Dom("root");
Xpp3Dom level1 = new Xpp3Dom("level1");
dom.addChild(level1);
diff --git
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
index fedd624..ebe2236 100644
---
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
+++
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.fail;
* @author <a href="mailto:[email protected]";>Brett Porter</a>
*/
@SuppressWarnings("javadoc")
-public class SiteModelInheritanceAssemblerTest {
+class SiteModelInheritanceAssemblerTest {
private final SiteModelInheritanceAssembler assembler = new
DefaultSiteModelInheritanceAssembler();
private static final String NAME = "Name";
@@ -56,7 +56,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testInheritance() throws IOException, XmlPullParserException {
+ void inheritance() throws Exception {
SiteModel childModel = readModel("inheritance-child.xml");
SiteModel parentModel = readModel("inheritance-parent.xml");
@@ -92,7 +92,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testSuppressedInheritance() throws IOException,
XmlPullParserException {
+ void suppressedInheritance() throws Exception {
SiteModel unassembledChildModel =
readModel("inheritance-child-no-inheritance.xml");
SiteModel childModel =
readModel("inheritance-child-no-inheritance.xml");
SiteModel parentModel = readModel("inheritance-parent.xml");
@@ -123,7 +123,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedWhenEmpty() throws IOException,
XmlPullParserException {
+ void pathsResolvedWhenEmpty() throws Exception {
// Test an empty model avoids NPEs
SiteModel childModel = readModel("empty.xml");
SiteModel parentModel = readModel("empty.xml");
@@ -149,7 +149,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsNotResolvedForExternalUrls() throws IOException,
XmlPullParserException {
+ void pathsNotResolvedForExternalUrls() throws Exception {
SiteModel parentModel = readModel("external-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -203,7 +203,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForRelativeUrls() throws IOException,
XmlPullParserException {
+ void pathsResolvedForRelativeUrls() throws Exception {
SiteModel parentModel = readModel("relative-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -254,7 +254,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForSubsiteUrls() throws IOException,
XmlPullParserException {
+ void pathsResolvedForSubsiteUrls() throws Exception {
SiteModel parentModel = readModel("subsite-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -308,7 +308,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForRelativeUrlsDepthOfTwo() throws
IOException, XmlPullParserException {
+ void pathsResolvedForRelativeUrlsDepthOfTwo() throws Exception {
SiteModel parentModel = readModel("relative-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -359,7 +359,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForReverseRelativeUrls() throws IOException,
XmlPullParserException {
+ void pathsResolvedForReverseRelativeUrls() throws Exception {
SiteModel parentModel = readModel("relative-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -410,7 +410,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForReverseRelativeUrlsDepthOfTwo() throws
IOException, XmlPullParserException {
+ void pathsResolvedForReverseRelativeUrlsDepthOfTwo() throws Exception {
SiteModel parentModel = readModel("relative-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -461,7 +461,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testPathsResolvedForUnrelatedRelativeUrls() throws
IOException, XmlPullParserException {
+ void pathsResolvedForUnrelatedRelativeUrls() throws Exception {
SiteModel parentModel = readModel("relative-urls.xml");
SiteModel childModel = readModel("empty.xml");
@@ -521,7 +521,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testNullParent() throws IOException, XmlPullParserException {
+ void nullParent() throws Exception {
SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
@@ -543,7 +543,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testFullyPopulatedChild() throws IOException,
XmlPullParserException {
+ void fullyPopulatedChild() throws Exception {
SiteModel childModel = readModel("fully-populated-child.xml");
SiteModel parentModel = readModel("fully-populated-child.xml");
@@ -568,7 +568,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testFullyPopulatedParentAndEmptyChild() throws IOException,
XmlPullParserException {
+ void fullyPopulatedParentAndEmptyChild() throws Exception {
SiteModel childModel = readModel("empty.xml");
SiteModel parentModel = readModel("fully-populated-child.xml");
@@ -599,7 +599,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testResolvingAllExternalUrls() throws IOException,
XmlPullParserException {
+ void resolvingAllExternalUrls() throws Exception {
SiteModel model = readModel("external-urls.xml");
assembler.resolvePaths(model, "http://foo.com/";);
@@ -614,7 +614,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testResolvingAllRelativeUrls() throws IOException,
XmlPullParserException {
+ void resolvingAllRelativeUrls() throws Exception {
SiteModel model = readModel("relative-urls.xml");
assembler.resolvePaths(model, "http://foo.com/";);
@@ -630,7 +630,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testResolvingAllSiteUrls() throws IOException,
XmlPullParserException {
+ void resolvingAllSiteUrls() throws Exception {
SiteModel model = readModel("subsite-urls.xml");
assembler.resolvePaths(model, "http://maven.apache.org/";);
@@ -681,7 +681,7 @@ public class SiteModelInheritanceAssemblerTest {
* @throws XmlPullParserException
*/
@Test
- public void testResolvingEmptyDescriptor() throws IOException,
XmlPullParserException {
+ void resolvingEmptyDescriptor() throws Exception {
SiteModel model = readModel("empty.xml");
assembler.resolvePaths(model, "http://maven.apache.org";);
SiteModel mergedModel = readModel("empty.xml");
@@ -693,7 +693,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testDuplicateParentElements() {
+ void duplicateParentElements() {
SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addLink(createLinkItem("Foo",
"http://foo.apache.org";));
@@ -723,7 +723,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testDuplicateChildElements() {
+ void duplicateChildElements() {
SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addLink(createLinkItem("Foo",
"http://foo.apache.org";));
@@ -755,7 +755,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testBadHref() {
+ void badHref() {
final SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addBreadcrumb(createLinkItem("Foo",
"http://foo.apache.org/${property}";));
@@ -771,7 +771,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testBreadcrumbWithoutHref() {
+ void breadcrumbWithoutHref() {
SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addBreadcrumb(createLinkItem("Foo", null));
@@ -785,7 +785,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testBreadcrumbs() {
+ void breadcrumbs() {
String parentHref = "http://parent.com/index.html";;
final SiteModel parent = new SiteModel();
@@ -847,7 +847,7 @@ public class SiteModelInheritanceAssemblerTest {
* https://issues.apache.org/jira/browse/DOXIASITETOOLS-62
*/
@Test
- public void testBreadcrumbCutParentAfterDuplicate() {
+ void breadcrumbCutParentAfterDuplicate() {
SiteModel child = new SiteModel(); // B > E
child.setBody(new Body());
child.getBody().addBreadcrumb(createLinkItem("B", null));
@@ -874,7 +874,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testBannerWithoutHref() {
+ void bannerWithoutHref() {
SiteModel model = new SiteModel();
model.setBody(new Body());
@@ -891,7 +891,7 @@ public class SiteModelInheritanceAssemblerTest {
*
*/
@Test
- public void testLogoWithoutImage() {
+ void logoWithoutImage() {
// This should actually be validated in the model, it doesn't really
make sense
SiteModel model = new SiteModel();
model.setBody(new Body());
diff --git
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
index adde644..fb4f11b 100644
---
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
+++
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
@@ -34,14 +34,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* @since 1.2
*/
@SuppressWarnings("javadoc")
-public class URIPathDescriptorTest {
+class URIPathDescriptorTest {
private static final String BASE_URL = "http://maven.apache.org/";;
/**
* Test of constructor, of class URIPathDescriptor.
*/
@Test
- public void testConstructor() {
+ void constructor() {
final String expected = BASE_URL + "doxia";
final URIPathDescriptor path = new URIPathDescriptor(BASE_URL,
"doxia");
@@ -94,7 +94,7 @@ public class URIPathDescriptorTest {
* @throws Exception
*/
@Test
- public void testResolveLink() {
+ void resolveLink() {
final String expected = BASE_URL + "source";
URIPathDescriptor oldPath = new URIPathDescriptor(BASE_URL, "source");
@@ -142,7 +142,7 @@ public class URIPathDescriptorTest {
* Test of rebaseLink method, of class URIPathDescriptor.
*/
@Test
- public void testRebaseLink() {
+ void rebaseLink() {
URIPathDescriptor oldPath = new URIPathDescriptor(BASE_URL, "source");
assertEquals(
"../source",
@@ -213,7 +213,7 @@ public class URIPathDescriptorTest {
* Test of relativizeLink method, of class URIPathDescriptor.
*/
@Test
- public void testRelativizeLink() {
+ void relativizeLink() {
URIPathDescriptor path = new URIPathDescriptor(BASE_URL, "source");
assertEquals("source", path.relativizeLink().toString());
@@ -263,7 +263,7 @@ public class URIPathDescriptorTest {
* @throws Exception
*/
@Test
- public void testSameSite() throws Exception {
+ void sameSite() throws Exception {
final URIPathDescriptor path = new URIPathDescriptor(BASE_URL,
"doxia");
assertTrue(path.sameSite(new URI("http://maven.apache.org/";)));
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
index 21fe068..e0badc5 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -97,7 +97,7 @@ public class AttributesVerifier extends AbstractVerifier {
assertEquals("Project", img.getAttribute("alt"));
// test object identity to distinguish the case ATTRIBUTE_VALUE_EMPTY
- assertSame(img.getAttribute("dummy"),
HtmlElement.ATTRIBUTE_NOT_DEFINED);
+ assertSame(HtmlElement.ATTRIBUTE_NOT_DEFINED,
img.getAttribute("dummy"));
HtmlTable table = (HtmlTable) elementIterator.next();
assertEquals("none", table.getAttribute("class"));
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index fe9fa24..a909127 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -145,7 +145,7 @@ public class DefaultSiteRendererTest {
* @throws Exception if something goes wrong.
*/
@Test
- public void testRenderExceptionMessageWhenLineNumberIsNotAvailable()
throws Exception {
+ void renderExceptionMessageWhenLineNumberIsNotAvailable() throws Exception
{
final File testBasedir = getTestFile("src/test/resources/site/xdoc");
final String testDocument = "head.xml";
final String exceptionMessage = "parse error occurred";
@@ -176,7 +176,7 @@ public class DefaultSiteRendererTest {
* @throws Exception if something goes wrong.
*/
@Test
- public void testRenderExceptionMessageWhenLineNumberIsAvailable() throws
Exception {
+ void renderExceptionMessageWhenLineNumberIsAvailable() throws Exception {
final File testBasedir = getTestFile("src/test/resources/site/xdoc");
final String testDocumentName = "head.xml";
final String exceptionMessage = "parse error occurred";
@@ -208,7 +208,7 @@ public class DefaultSiteRendererTest {
* @throws Exception if something goes wrong.
*/
@Test
- public void testRender() throws Exception {
+ void render() throws Exception {
// Safety
org.apache.commons.io.FileUtils.deleteDirectory(getTestFile(OUTPUT));
@@ -248,7 +248,7 @@ public class DefaultSiteRendererTest {
}
@Test
- public void testExternalReport() throws Exception {
+ void externalReport() throws Exception {
DocumentRenderer docRenderer = mock(DocumentRenderer.class);
when(docRenderer.isExternalReport()).thenReturn(true);
when(docRenderer.getOutputName()).thenReturn("external/index");
@@ -263,7 +263,7 @@ public class DefaultSiteRendererTest {
}
@Test
- public void testVelocityToolManager() throws Exception {
+ void velocityToolManager() throws Exception {
StringWriter writer = new StringWriter();
SiteRenderingContext siteRenderingContext = new SiteRenderingContext();
@@ -293,7 +293,7 @@ public class DefaultSiteRendererTest {
}
@Test
- public void testVelocityToolManagerForSkin() throws Exception {
+ void velocityToolManagerForSkin() throws Exception {
StringWriter writer = new StringWriter();
File skinFile = skinJar;
@@ -321,14 +321,14 @@ public class DefaultSiteRendererTest {
}
@Test
- public void testMatchVersion() throws Exception {
+ void matchVersion() throws Exception {
DefaultSiteRenderer r = (DefaultSiteRenderer) siteRenderer;
assertTrue(r.matchVersion("1.7", "1.7"));
assertFalse(r.matchVersion("1.7", "1.8"));
}
@Test
- public void testLocateDocumentFiles() throws IOException,
RendererException {
+ void locateDocumentFiles() throws Exception {
SiteRenderingContext context = new SiteRenderingContext();
File sourceDirectory = getTestFile("src/test/resources/site-validate");
context.setRootDirectory(sourceDirectory);
@@ -340,7 +340,7 @@ public class DefaultSiteRendererTest {
}
@Test
- public void testLocateDocumentFilesWithNameClashes() throws IOException,
RendererException {
+ void locateDocumentFilesWithNameClashes() throws Exception {
SiteRenderingContext context = new SiteRenderingContext();
File sourceDirectory = getTestFile("src/test/resources/site-validate");
context.setRootDirectory(sourceDirectory);
@@ -350,8 +350,7 @@ public class DefaultSiteRendererTest {
}
@Test
- public void
testLocateDocumentFilesWithNameClashesInSkippingDuplicatesDirectory()
- throws IOException, RendererException {
+ void locateDocumentFilesWithNameClashesInSkippingDuplicatesDirectory()
throws Exception {
SiteRenderingContext context = new SiteRenderingContext();
File sourceDirectory = getTestFile("src/test/resources/site-validate");
context.setRootDirectory(sourceDirectory);
@@ -418,7 +417,7 @@ public class DefaultSiteRendererTest {
try {
reader = ReaderFactory.newXmlReader(macro);
String content = IOUtil.toString(reader);
- assertEquals(content.indexOf("</macro>"), -1);
+ assertEquals(-1, content.indexOf("</macro>"));
} finally {
IOUtil.close(reader);
}
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
index dfd332e..8e235c9 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
@@ -67,7 +67,9 @@ public class EntitiesVerifier extends AbstractVerifier {
anchor.getAttribute("id"));
HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
assertNotNull(h1);
- assertEquals(h1.asNormalizedText().trim(), "section name with
entities: '&' '\u0391' ' ' '\uD835\uDFED'");
+ assertEquals(
+ "section name with entities: '&' '\u0391' ' ' '\uD835\uDFED'",
+ h1.asNormalizedText().trim());
section = (HtmlSection) elementIterator.next();
assertNotNull(section);
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/RenderingContextTest.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/RenderingContextTest.java
index e79ffba..5e8fae5 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/RenderingContextTest.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/RenderingContextTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* @since 20 oct. 07
*/
@PlexusTest
-public class RenderingContextTest {
+class RenderingContextTest {
/**
* Test getRelativePath() with various file paths.
@@ -39,7 +39,7 @@ public class RenderingContextTest {
* @throws java.lang.Exception if any.
*/
@Test
- public void testFilePathWithDot() throws Exception {
+ void filePathWithDot() throws Exception {
File baseDir = new File(getBasedir() + File.separatorChar + "test" +
File.separatorChar + "resources");
String document = "file.with.dot.in.name.xml";
