This is an automated email from the ASF dual-hosted git repository.
slawekjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 438c2fe Migration tests to JUnit 5
438c2fe is described below
commit 438c2fe045816a8f02cb2a0cdf8e75da5212ee7b
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Mon May 11 22:31:30 2026 +0200
Migration tests to JUnit 5
- first step
---
pom.xml | 11 +++
.../maven/plugins/changelog/ChangeLogTest.java | 88 ++++++++++------------
.../changelog/FileActivityComparatorTest.java | 30 ++++----
3 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/pom.xml b/pom.xml
index 68422fe..b929920 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,6 +317,17 @@ under the License.
<artifactId>plexus-xml</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- remove after migration all tests to JUnit 5 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/src/test/java/org/apache/maven/plugins/changelog/ChangeLogTest.java
b/src/test/java/org/apache/maven/plugins/changelog/ChangeLogTest.java
index 47b12c1..8f119fc 100644
--- a/src/test/java/org/apache/maven/plugins/changelog/ChangeLogTest.java
+++ b/src/test/java/org/apache/maven/plugins/changelog/ChangeLogTest.java
@@ -27,124 +27,118 @@ import java.util.List;
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.command.changelog.ChangeLogSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* @author Edwin Punzalan
*/
-public class ChangeLogTest {
+class ChangeLogTest {
@Test
- public void testReadFile() throws Exception {
+ void testReadFile() throws Exception {
List<ChangeLogSet> changedLogs = readChangeLogXml("min-changelog.xml");
- assertNotNull("Test changedSets were parsed", changedLogs);
+ assertNotNull(changedLogs, "Test changedSets were parsed");
- assertEquals("Test number of changelog entries", 2,
changedLogs.size());
+ assertEquals(2, changedLogs.size(), "Test number of changelog
entries");
ChangeLogSet changelogSets = changedLogs.get(0);
- assertEquals(
- "Test number of revisions on changelog 1",
- 2,
- changelogSets.getChangeSets().size());
+ assertEquals(2, changelogSets.getChangeSets().size(), "Test number of
revisions on changelog 1");
ChangeSet changeSet = changelogSets.getChangeSets().get(0);
assertEquals(
- "Test changelog 1 set 1 date/time",
"1977-08-06 05:30:00",
- new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()));
+ new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()),
+ "Test changelog 1 set 1 date/time");
- assertEquals("Test changelog 1 set 1 author", "Edwin Punzalan",
changeSet.getAuthor());
+ assertEquals("Edwin Punzalan", changeSet.getAuthor(), "Test changelog
1 set 1 author");
- assertEquals("Test changelog 1 set 1 msg", "First commit msg",
changeSet.getComment());
+ assertEquals("First commit msg", changeSet.getComment(), "Test
changelog 1 set 1 msg");
- assertEquals("Test changelog 1 set 1 files", 1,
changeSet.getFiles().size());
+ assertEquals(1, changeSet.getFiles().size(), "Test changelog 1 set 1
files");
ChangeFile changeFile = changeSet.getFiles().get(0);
- assertEquals("Test changelog 1 set 1 file 1 filename",
"/path/to/file.extension", changeFile.getName());
+ assertEquals("/path/to/file.extension", changeFile.getName(), "Test
changelog 1 set 1 file 1 filename");
- assertEquals("Test changelog 1 set 1 file 1 revision", "1",
changeFile.getRevision());
+ assertEquals("1", changeFile.getRevision(), "Test changelog 1 set 1
file 1 revision");
changeSet = changelogSets.getChangeSets().get(1);
assertEquals(
- "Test changelog 1 set 2 date/time",
"2005-02-24 21:30:00",
- new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()));
+ new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()),
+ "Test changelog 1 set 2 date/time");
- assertEquals("Test changelog 1 set 2 author", "Edwin Punzalan",
changeSet.getAuthor());
+ assertEquals("Edwin Punzalan", changeSet.getAuthor(), "Test changelog
1 set 2 author");
- assertEquals("Test changelog 1 set 2 msg", "Second commit msg",
changeSet.getComment());
+ assertEquals("Second commit msg", changeSet.getComment(), "Test
changelog 1 set 2 msg");
- assertEquals("Test changelog 1 set 2 files", 2,
changeSet.getFiles().size());
+ assertEquals(2, changeSet.getFiles().size(), "Test changelog 1 set 2
files");
changeFile = changeSet.getFiles().get(0);
- assertEquals("Test changelog 1 set 2 file 1 filename",
"/path/to/file.extension", changeFile.getName());
+ assertEquals("/path/to/file.extension", changeFile.getName(), "Test
changelog 1 set 2 file 1 filename");
- assertEquals("Test changelog 1 set 2 file 1 revision", "2",
changeFile.getRevision());
+ assertEquals("2", changeFile.getRevision(), "Test changelog 1 set 2
file 1 revision");
changeFile = changeSet.getFiles().get(1);
- assertEquals("Test changelog 1 set 2 file 2 filename",
"/path/to/file2.extension", changeFile.getName());
+ assertEquals("/path/to/file2.extension", changeFile.getName(), "Test
changelog 1 set 2 file 2 filename");
- assertEquals("Test changelog 1 set 2 file 2 revision", "2",
changeFile.getRevision());
+ assertEquals("2", changeFile.getRevision(), "Test changelog 1 set 2
file 2 revision");
changelogSets = changedLogs.get(1);
- assertEquals(
- "Test number of revisions on changelog 2",
- 2,
- changelogSets.getChangeSets().size());
+ assertEquals(2, changelogSets.getChangeSets().size(), "Test number of
revisions on changelog 2");
changeSet = changelogSets.getChangeSets().get(0);
assertEquals(
- "Test changelog 2 set 1 date/time",
"2005-02-25 22:45:00",
- new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()));
+ new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()),
+ "Test changelog 2 set 1 date/time");
- assertEquals("Test changelog 2 set 1 author", "Keogh Edrich Punzalan",
changeSet.getAuthor());
+ assertEquals("Keogh Edrich Punzalan", changeSet.getAuthor(), "Test
changelog 2 set 1 author");
- assertEquals("Test changelog 2 set 1 msg", "Third commit msg",
changeSet.getComment());
+ assertEquals("Third commit msg", changeSet.getComment(), "Test
changelog 2 set 1 msg");
- assertEquals("Test changelog 2 set 1 files", 1,
changeSet.getFiles().size());
+ assertEquals(1, changeSet.getFiles().size(), "Test changelog 2 set 1
files");
changeFile = changeSet.getFiles().get(0);
- assertEquals("Test changelog 2 set 1 file 1 filename",
"/path/to/file.extension", changeFile.getName());
+ assertEquals("/path/to/file.extension", changeFile.getName(), "Test
changelog 2 set 1 file 1 filename");
- assertEquals("Test changelog 2 set 1 file 1 revision", "3",
changeFile.getRevision());
+ assertEquals("3", changeFile.getRevision(), "Test changelog 2 set 1
file 1 revision");
changeSet = changelogSets.getChangeSets().get(1);
assertEquals(
- "Test changelog 2 set 2 date/time",
"2100-02-25 05:30:00",
- new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()));
+ new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss").format(changeSet.getDate()),
+ "Test changelog 2 set 2 date/time");
- assertEquals("Test changelog 2 set 2 author", "Keogh Edrich Punzalan",
changeSet.getAuthor());
+ assertEquals("Keogh Edrich Punzalan", changeSet.getAuthor(), "Test
changelog 2 set 2 author");
- assertEquals("Test changelog 2 set 2 msg", "Last commit msg",
changeSet.getComment());
+ assertEquals("Last commit msg", changeSet.getComment(), "Test
changelog 2 set 2 msg");
- assertEquals("Test changelog 2 set 2 files", 2,
changeSet.getFiles().size());
+ assertEquals(2, changeSet.getFiles().size(), "Test changelog 2 set 2
files");
changeFile = changeSet.getFiles().get(0);
- assertEquals("Test changelog 2 set 2 file 1 filename",
"/path/to/file.extension", changeFile.getName());
+ assertEquals("/path/to/file.extension", changeFile.getName(), "Test
changelog 2 set 2 file 1 filename");
- assertEquals("Test changelog 2 set 2 file 1 revision", "4",
changeFile.getRevision());
+ assertEquals("4", changeFile.getRevision(), "Test changelog 2 set 2
file 1 revision");
changeFile = changeSet.getFiles().get(1);
- assertEquals("Test changelog 2 set 2 file 2 filename",
"/path/to/file2.extension", changeFile.getName());
+ assertEquals("/path/to/file2.extension", changeFile.getName(), "Test
changelog 2 set 2 file 2 filename");
- assertEquals("Test changelog 2 set 2 file 2 revision", "4",
changeFile.getRevision());
+ assertEquals("4", changeFile.getRevision(), "Test changelog 2 set 2
file 2 revision");
}
private List<ChangeLogSet> readChangeLogXml(String filename) throws
Exception {
diff --git
a/src/test/java/org/apache/maven/plugins/changelog/FileActivityComparatorTest.java
b/src/test/java/org/apache/maven/plugins/changelog/FileActivityComparatorTest.java
index d869cba..81f61e8 100644
---
a/src/test/java/org/apache/maven/plugins/changelog/FileActivityComparatorTest.java
+++
b/src/test/java/org/apache/maven/plugins/changelog/FileActivityComparatorTest.java
@@ -22,33 +22,33 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.scm.ChangeFile;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Edwin Punzalan
*/
-public class FileActivityComparatorTest {
+class FileActivityComparatorTest {
private FileActivityComparator comparator;
/**
* {@inheritDoc}
*/
- @Before
- public void setUp() {
+ @BeforeEach
+ void setUp() {
comparator = new FileActivityComparator();
}
@Test
- public void testCompareByNumberOfCommits() {
+ void testCompareByNumberOfCommits() {
List<ChangeFile> list1 = new ArrayList<>();
list1.add(new ChangeFile("anything"));
List<ChangeFile> list2 = new ArrayList<>();
- assertTrue("Test compare by commits, less than",
comparator.compare(list1, list2) < 0);
+ assertTrue(comparator.compare(list1, list2) < 0, "Test compare by
commits, less than");
list1 = new ArrayList<>();
list1.add(new ChangeFile("anything"));
@@ -57,11 +57,11 @@ public class FileActivityComparatorTest {
list2.add(new ChangeFile("one thing"));
list2.add(new ChangeFile("something"));
- assertTrue("Test compare by commits, greater than",
comparator.compare(list1, list2) > 0);
+ assertTrue(comparator.compare(list1, list2) > 0, "Test compare by
commits, greater than");
}
@Test
- public void testCompareByRevision() {
+ void testCompareByRevision() {
List<ChangeFile> list1 = new ArrayList<>();
list1.add(new ChangeFile("changefile-1", "123"));
list1.add(new ChangeFile("changefile-1", "234"));
@@ -70,7 +70,7 @@ public class FileActivityComparatorTest {
list2.add(new ChangeFile("changefile-2", "246"));
list2.add(new ChangeFile("changefile-2", "468"));
- assertTrue("Test compare by revision, less than",
comparator.compare(list1, list2) < 0);
+ assertTrue(comparator.compare(list1, list2) < 0, "Test compare by
revision, less than");
list1 = new ArrayList<>();
list1.add(new ChangeFile("changefile-1", "246"));
@@ -80,11 +80,11 @@ public class FileActivityComparatorTest {
list2.add(new ChangeFile("changefile-2", "123"));
list2.add(new ChangeFile("changefile-2", "234"));
- assertTrue("Test compare by revision, greater than",
comparator.compare(list1, list2) > 0);
+ assertTrue(comparator.compare(list1, list2) > 0, "Test compare by
revision, greater than");
}
@Test
- public void testCompareByName() {
+ void testCompareByName() {
List<ChangeFile> list1 = new ArrayList<>();
list1.add(new ChangeFile("changefile-1", "123"));
list1.add(new ChangeFile("changefile-1", "468"));
@@ -93,7 +93,7 @@ public class FileActivityComparatorTest {
list2.add(new ChangeFile("changefile-2", "246"));
list2.add(new ChangeFile("changefile-2", "468"));
- assertTrue("Test compare by name, less than",
comparator.compare(list1, list2) < 0);
+ assertTrue(comparator.compare(list1, list2) < 0, "Test compare by
name, less than");
list1 = new ArrayList<>();
list1.add(new ChangeFile("changefile-1", "246"));
@@ -103,6 +103,6 @@ public class FileActivityComparatorTest {
list2.add(new ChangeFile("changefile-2", "123"));
list2.add(new ChangeFile("changefile-2", "234"));
- assertTrue("Test compare by name, greater than",
comparator.compare(list1, list2) > 0);
+ assertTrue(comparator.compare(list1, list2) > 0, "Test compare by
name, greater than");
}
}
