You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/17 20:31:53 UTC
[maven-changelog-plugin] branch MCHANGELOG-150 updated (eed934b ->
8cdbbf3)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MCHANGELOG-150
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git.
discard eed934b [MCHANGELOG-150] Bump junit from 3.8.2 to 4.13
new 8cdbbf3 [MCHANGELOG-150] Bump junit from 3.8.2 to 4.13
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (eed934b)
\
N -- N -- N refs/heads/MCHANGELOG-150 (8cdbbf3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../maven/plugin/changelog/ChangeLogTest.java | 34 +++++++++++++---------
.../changelog/FileActivityComparatorTest.java | 14 +++++----
2 files changed, 30 insertions(+), 18 deletions(-)
[maven-changelog-plugin] 01/01: [MCHANGELOG-150] Bump junit from
3.8.2 to 4.13
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHANGELOG-150
in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git
commit 8cdbbf3ede0591e1fb096d2b6ef0bf8778d043c3
Author: dependabot-preview[bot] <27...@users.noreply.github.com>
AuthorDate: Thu Feb 13 01:06:05 2020 +0000
[MCHANGELOG-150] Bump junit from 3.8.2 to 4.13
Bumps [junit](https://github.com/junit-team/junit4) from 3.8.2 to 4.13.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.13.md)
- [Commits](https://github.com/junit-team/junit4/compare/r3.8.2...r4.13)
Signed-off-by: dependabot-preview[bot] <su...@dependabot.com>
---
pom.xml | 2 +-
.../maven/plugin/changelog/ChangeLogTest.java | 34 +++++++++++++---------
.../changelog/FileActivityComparatorTest.java | 14 +++++----
3 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8636d59..2f18115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,7 +309,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
index d069363..fffe7e5 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugin.changelog;
* under the License.
*/
-import junit.framework.TestCase;
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 java.io.File;
import java.io.FileInputStream;
@@ -30,13 +30,15 @@ import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* @author Edwin Punzalan
- * @version $Id$
*/
public class ChangeLogTest
- extends TestCase
{
+ @Test
public void testReadFile()
throws Exception
{
@@ -53,7 +55,7 @@ public class ChangeLogTest
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() ) );
assertEquals( "Test changelog 1 set 1 author", "Edwin Punzalan", changeSet.getAuthor() );
@@ -63,14 +65,15 @@ public class ChangeLogTest
ChangeFile changeFile = changeSet.getFiles().get( 0 );
- assertEquals( "Test changelog 1 set 1 file 1 filename", "/path/to/file.extension", changeFile.getName() );
+ assertEquals( "Test changelog 1 set 1 file 1 filename", "/path/to/file.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 1 set 1 file 1 revision", "1", changeFile.getRevision() );
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() ) );
assertEquals( "Test changelog 1 set 2 author", "Edwin Punzalan", changeSet.getAuthor() );
@@ -80,13 +83,15 @@ public class ChangeLogTest
changeFile = changeSet.getFiles().get( 0 );
- assertEquals( "Test changelog 1 set 2 file 1 filename", "/path/to/file.extension", changeFile.getName() );
+ assertEquals( "Test changelog 1 set 2 file 1 filename", "/path/to/file.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 1 set 2 file 1 revision", "2", changeFile.getRevision() );
changeFile = changeSet.getFiles().get( 1 );
- assertEquals( "Test changelog 1 set 2 file 2 filename", "/path/to/file2.extension", changeFile.getName() );
+ assertEquals( "Test changelog 1 set 2 file 2 filename", "/path/to/file2.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 1 set 2 file 2 revision", "2", changeFile.getRevision() );
@@ -97,7 +102,7 @@ public class ChangeLogTest
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() ) );
assertEquals( "Test changelog 2 set 1 author", "Keogh Edrich Punzalan", changeSet.getAuthor() );
@@ -107,14 +112,15 @@ public class ChangeLogTest
changeFile = changeSet.getFiles().get( 0 );
- assertEquals( "Test changelog 2 set 1 file 1 filename", "/path/to/file.extension", changeFile.getName() );
+ assertEquals( "Test changelog 2 set 1 file 1 filename", "/path/to/file.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 2 set 1 file 1 revision", "3", changeFile.getRevision() );
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() ) );
assertEquals( "Test changelog 2 set 2 author", "Keogh Edrich Punzalan", changeSet.getAuthor() );
@@ -124,13 +130,15 @@ public class ChangeLogTest
changeFile = changeSet.getFiles().get( 0 );
- assertEquals( "Test changelog 2 set 2 file 1 filename", "/path/to/file.extension", changeFile.getName() );
+ assertEquals( "Test changelog 2 set 2 file 1 filename", "/path/to/file.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 2 set 2 file 1 revision", "4", changeFile.getRevision() );
changeFile = changeSet.getFiles().get( 1 );
- assertEquals( "Test changelog 2 set 2 file 2 filename", "/path/to/file2.extension", changeFile.getName() );
+ assertEquals( "Test changelog 2 set 2 file 2 filename", "/path/to/file2.extension",
+ changeFile.getName() );
assertEquals( "Test changelog 2 set 2 file 2 revision", "4", changeFile.getRevision() );
}
diff --git a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
index 790cae7..4eef04f 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
@@ -19,30 +19,32 @@ package org.apache.maven.plugin.changelog;
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.scm.ChangeFile;
+import org.junit.Before;
+import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
+import static org.junit.Assert.assertTrue;
+
/**
* @author Edwin Punzalan
- * @version $Id$
*/
public class FileActivityComparatorTest
- extends TestCase
{
private FileActivityComparator comparator;
/**
* {@inheritDoc}
*/
- protected void setUp()
- throws Exception
+ @Before
+ public void setUp()
{
comparator = new FileActivityComparator();
}
+ @Test
public void testCompareByNumberOfCommits()
{
List<ChangeFile> list1 = new ArrayList<ChangeFile>();
@@ -62,6 +64,7 @@ public class FileActivityComparatorTest
assertTrue( "Test compare by commits, greater than", comparator.compare( list1, list2 ) > 0 );
}
+ @Test
public void testCompareByRevision()
{
List<ChangeFile> list1 = new ArrayList<ChangeFile>();
@@ -85,6 +88,7 @@ public class FileActivityComparatorTest
assertTrue( "Test compare by revision, greater than", comparator.compare( list1, list2 ) > 0 );
}
+ @Test
public void testCompareByName()
{
List<ChangeFile> list1 = new ArrayList<ChangeFile>();