diff --git a/git-changelist-maven-extension/pom.xml b/git-changelist-maven-extension/pom.xml index 576780c..ef972bb 100644 --- a/git-changelist-maven-extension/pom.xml +++ b/git-changelist-maven-extension/pom.xml @@ -36,9 +36,15 @@ 6.5.0.202303070854-r - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + 5.9.3 + test + + + org.hamcrest + hamcrest + 2.2 test diff --git a/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java b/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java index 5bdfe5c..110fdd8 100644 --- a/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java +++ b/git-changelist-maven-extension/src/test/java/io/jenkins/tools/incrementals/git_changelist_maven_extension/MainTest.java @@ -25,11 +25,12 @@ package io.jenkins.tools.incrementals.git_changelist_maven_extension; import org.apache.maven.artifact.versioning.ComparableVersion; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; public class MainTest { @@ -43,7 +44,8 @@ public class MainTest { "pr", "dev", }; - @Test public void alphaBeta() { + @Test + public void alphaBeta() { String hash = "852b473a2b8c"; String sanitized = Main.sanitize(hash); assertThat(hash + " has been sanitized to the expected format", sanitized, is("852b_473a_2b_8c")); diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 6caf5d6..6a119dc 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -10,6 +10,7 @@ maven-plugin 3.8.1 + 5.9.3 @@ -64,9 +65,21 @@ provided - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + + + org.hamcrest + hamcrest + 2.2 test diff --git a/maven-plugin/src/test/java/io/jenkins/tools/incrementals/maven/DetectIndentTest.java b/maven-plugin/src/test/java/io/jenkins/tools/incrementals/maven/DetectIndentTest.java index fd55f3c..2ff1161 100644 --- a/maven-plugin/src/test/java/io/jenkins/tools/incrementals/maven/DetectIndentTest.java +++ b/maven-plugin/src/test/java/io/jenkins/tools/incrementals/maven/DetectIndentTest.java @@ -1,40 +1,27 @@ package io.jenkins.tools.incrementals.maven; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + import java.util.Arrays; import java.util.Collection; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(Parameterized.class) public class DetectIndentTest { - @Parameterized.Parameters public static Collection data() { return Arrays.asList(new Object[][] { { "abc", 0, ' ' }, { " abc", 2, ' ' }, { " abc", 4, ' ' }, { "\t\tabc", 2, '\t' }, { "\tabc", 1, '\t' } }); } - private String input; - - private int size; - - private char type; - - public DetectIndentTest(String input, int size, char type) { - this.input = input; - this.size = size; - this.type = type; - } - - @Test - public void detectIndentSize() { + @ParameterizedTest + @MethodSource("data") + public void detectIndentSize(String input, int size, char type) { DetectIndent detectIndent = new DetectIndent(); DetectIndent.Indent indent = detectIndent.detect(input); - Assert.assertEquals(size, indent.size); - Assert.assertEquals(type, indent.type); + assertEquals(size, indent.getSize()); + assertEquals(type, indent.getType()); } }