From a1b94d5badb311e58f7621cf421d5a51e248096c Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 21 May 2023 21:14:22 +0200 Subject: [PATCH 1/3] Move to JUnit 5 --- git-changelist-maven-extension/pom.xml | 12 +++++++++--- .../git_changelist_maven_extension/MainTest.java | 12 +++++++----- maven-plugin/pom.xml | 12 +++++++++--- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/git-changelist-maven-extension/pom.xml b/git-changelist-maven-extension/pom.xml index 5f934e3..8b2fabc 100644 --- a/git-changelist-maven-extension/pom.xml +++ b/git-changelist-maven-extension/pom.xml @@ -36,9 +36,15 @@ 4.9.0.201710071750-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..987c75a 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -64,9 +64,15 @@ provided - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + 5.9.3 + test + + + org.hamcrest + hamcrest + 2.2 test From 9f76b372396a0670e6d24c035de1f94438dd4e18 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 22 May 2023 15:27:17 +0200 Subject: [PATCH 2/3] Update DetectIndentTest --- .../tools/incrementals/maven/DetectIndentTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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..cd2b6c3 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,17 +1,14 @@ package io.jenkins.tools.incrementals.maven; +import org.junit.jupiter.api.Test; + 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' } @@ -34,7 +31,7 @@ public DetectIndentTest(String input, int size, char type) { public void detectIndentSize() { DetectIndent detectIndent = new DetectIndent(); DetectIndent.Indent indent = detectIndent.detect(input); - Assert.assertEquals(size, indent.size); - Assert.assertEquals(type, indent.type); + assertEquals(size, indent.size); + assertEquals(type, indent.type); } } From 9bc1e7dba994865d9d0a1270de8905ef5de91007 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 22 May 2023 20:05:08 +0200 Subject: [PATCH 3/3] Restore parameterized test --- maven-plugin/pom.xml | 9 ++++++- .../incrementals/maven/DetectIndentTest.java | 24 ++++++------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 987c75a..6a119dc 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -10,6 +10,7 @@ maven-plugin 3.8.1 + 5.9.3 @@ -66,7 +67,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} 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 cd2b6c3..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,6 +1,7 @@ package io.jenkins.tools.incrementals.maven; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import java.util.Arrays; import java.util.Collection; @@ -15,23 +16,12 @@ public static Collection data() { }); } - 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); - assertEquals(size, indent.size); - assertEquals(type, indent.type); + assertEquals(size, indent.getSize()); + assertEquals(type, indent.getType()); } }