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
commit 467a268e6e65f34a3ee790ce6ecd0ba67cabcd78 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 01:50:25 2026 +0000 Use JUnit 5 assertions and Mockito best practices in tests --- .../test/java/org/apache/maven/doxia/site/ModelNamespaceTest.java | 4 ++-- .../org/apache/maven/doxia/siterenderer/MenuBreadcrumbsTest.java | 5 +++-- .../doxia/scm/siterenderer/ScmAttributesContextCustomizerTest.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/ModelNamespaceTest.java b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/ModelNamespaceTest.java index 7ff6b19..58f5a30 100644 --- a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/ModelNamespaceTest.java +++ b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/ModelNamespaceTest.java @@ -70,7 +70,7 @@ class ModelNamespaceTest { Pattern.DOTALL) .matcher(pom); assertTrue(matcher.find(), "site.mdo version in pom.xml"); - assertEquals(matcher.group(1), ModelNamespace.SITE_MODEL_VERSION); + assertEquals(ModelNamespace.SITE_MODEL_VERSION, matcher.group(1)); } @Test @@ -83,6 +83,6 @@ class ModelNamespaceTest { Pattern.DOTALL) .matcher(pom); assertTrue(matcher.find(), "skin.mdo version in doxia-skin-model/pom.xml"); - assertEquals(matcher.group(1), ModelNamespace.SKIN_MODEL_VERSION); + assertEquals(ModelNamespace.SKIN_MODEL_VERSION, matcher.group(1)); } } diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbsTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbsTest.java index 360e77f..2d0e2f9 100644 --- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbsTest.java +++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MenuBreadcrumbsTest.java @@ -29,6 +29,7 @@ import org.apache.maven.doxia.site.MenuItem; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; class MenuBreadcrumbsTest { @@ -67,7 +68,7 @@ class MenuBreadcrumbsTest { // only the enclosing menu is an ancestor; the matched item itself is not included assertTrail(trail, "Overview"); - assertEquals(null, trail.get(0).getHref()); // a Menu has no href of its own + assertNull(trail.get(0).getHref()); // a Menu has no href of its own } @Test @@ -79,7 +80,7 @@ class MenuBreadcrumbsTest { List<LinkItem> trail = MenuBreadcrumbs.derive(menus, "guides/user/index.html"); assertTrail(trail, "Documentation", "Guides"); - assertEquals(null, trail.get(1).getHref()); // "Guides" has no href of its own, only nested items + assertNull(trail.get(1).getHref()); // "Guides" has no href of its own, only nested items } @Test diff --git a/doxia-site-scm-context/src/test/java/org/apache/maven/doxia/scm/siterenderer/ScmAttributesContextCustomizerTest.java b/doxia-site-scm-context/src/test/java/org/apache/maven/doxia/scm/siterenderer/ScmAttributesContextCustomizerTest.java index d4c963e..67fe8bc 100644 --- a/doxia-site-scm-context/src/test/java/org/apache/maven/doxia/scm/siterenderer/ScmAttributesContextCustomizerTest.java +++ b/doxia-site-scm-context/src/test/java/org/apache/maven/doxia/scm/siterenderer/ScmAttributesContextCustomizerTest.java @@ -140,7 +140,7 @@ class ScmAttributesContextCustomizerTest { } @Test - void detectsShallowGitRepository() throws IOException { + void detectsShallowGitRepository() throws Exception { Path gitDirectory = Files.createDirectories(tempDirectory.resolve(".git")); assertFalse(ScmAttributesContextCustomizer.isShallowRepository(tempDirectory.toFile()));
