From 01b88db91f7c2673c7cbd3aad300c1f2c486fffb Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Thu, 19 Nov 2026 01:10:40 +0100 Subject: [PATCH] Parameterize version policy tests Replace copy-pasted cases with CsvSource parameterized tests; all original assertions are preserved. --- .../policies/DefaultVersionPolicyTest.java | 45 +++++-------------- .../release/scm/HgScmTranslatorTest.java | 31 +++++++------ 2 files changed, 30 insertions(+), 46 deletions(-) diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultVersionPolicyTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultVersionPolicyTest.java index 622ce80a2..e5b880b30 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultVersionPolicyTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultVersionPolicyTest.java @@ -20,46 +20,25 @@ import org.apache.maven.shared.release.policy.version.VersionPolicy; import org.apache.maven.shared.release.policy.version.VersionPolicyRequest; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import static org.junit.jupiter.api.Assertions.assertEquals; class DefaultVersionPolicyTest { private final VersionPolicy policy = new DefaultVersionPolicy(); - @Test - void testOneDigitReleaseVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1-SNAPSHOT"); - assertEquals("1", policy.getReleaseVersion(request).getVersion()); + @ParameterizedTest + @CsvSource({"1-SNAPSHOT, 1", "1.0-SNAPSHOT, 1.0", "1.0.0-SNAPSHOT, 1.0.0"}) + void testReleaseVersion(String version, String expected) throws Exception { + VersionPolicyRequest request = new VersionPolicyRequest().setVersion(version); + assertEquals(expected, policy.getReleaseVersion(request).getVersion()); } - @Test - void testOneDigitDevelopmentVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1"); - assertEquals("2-SNAPSHOT", policy.getDevelopmentVersion(request).getVersion()); - } - - @Test - void testTwoDigitsReleaseVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1.0-SNAPSHOT"); - assertEquals("1.0", policy.getReleaseVersion(request).getVersion()); - } - - @Test - void testTwoDigitsDevelopmentVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1.0"); - assertEquals("1.1-SNAPSHOT", policy.getDevelopmentVersion(request).getVersion()); - } - - @Test - void testThreeDigitsReleaseVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1.0.0-SNAPSHOT"); - assertEquals("1.0.0", policy.getReleaseVersion(request).getVersion()); - } - - @Test - void testThreeDigitsDevelopmentVersion() throws Exception { - VersionPolicyRequest request = new VersionPolicyRequest().setVersion("1.0.0"); - assertEquals("1.0.1-SNAPSHOT", policy.getDevelopmentVersion(request).getVersion()); + @ParameterizedTest + @CsvSource({"1, 2-SNAPSHOT", "1.0, 1.1-SNAPSHOT", "1.0.0, 1.0.1-SNAPSHOT"}) + void testDevelopmentVersion(String version, String expected) throws Exception { + VersionPolicyRequest request = new VersionPolicyRequest().setVersion(version); + assertEquals(expected, policy.getDevelopmentVersion(request).getVersion()); } } diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java index 1b05581bd..c2dff9048 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java @@ -18,7 +18,8 @@ */ package org.apache.maven.shared.release.scm; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -28,21 +29,25 @@ class HgScmTranslatorTest { /** * @see org.apache.maven.model.Scm#getTag() */ - @Test - void testResolveTag() { - assertEquals("HEAD", scmTranslator.resolveTag("HEAD")); - assertEquals("project-1.0", scmTranslator.resolveTag("project-1.0")); + @ParameterizedTest + @CsvSource({"HEAD, HEAD", "project-1.0, project-1.0"}) + void testResolveTag(String tag, String expected) { + assertEquals(expected, scmTranslator.resolveTag(tag)); } - @Test - void testTranslateTagUrl() { - assertEquals("url", scmTranslator.translateTagUrl("url", "tag", null)); - assertEquals("url", scmTranslator.translateTagUrl("url", "tag", "tagBase")); + @ParameterizedTest + @CsvSource( + value = {"url, url, NULL", "url, url, tagBase"}, + nullValues = "NULL") + void testTranslateTagUrl(String url, String expected, String tagBase) { + assertEquals(expected, scmTranslator.translateTagUrl(url, "tag", tagBase)); } - @Test - void testTranslateBranchUrl() { - assertEquals("url", scmTranslator.translateBranchUrl("url", "branchName", null)); - assertEquals("url", scmTranslator.translateBranchUrl("url", "branchName", "tagBase")); + @ParameterizedTest + @CsvSource( + value = {"url, url, NULL", "url, url, tagBase"}, + nullValues = "NULL") + void testTranslateBranchUrl(String url, String expected, String tagBase) { + assertEquals(expected, scmTranslator.translateBranchUrl(url, "branchName", tagBase)); } }