TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #3168: allow new line on end of commit (#3204)

This commit is contained in:
rnveach 2016-05-20 16:31:31 -04:00 committed by Roman Ivanov
parent 338b56ce8f
commit 93acc4e083
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
View File

@ -112,17 +112,26 @@ public class CommitValidationTest {
@Test
public void testCommitMessage() {
assertFalse("should not accept commit message with periods on end",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("minor: Test. Test.").matches());
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test. Test."))
.matches());
assertFalse("should not accept commit message with spaces on end",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("minor: Test. ").matches());
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test. "))
.matches());
assertFalse("should not accept commit message with tabs on end",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("minor: Test.\t").matches());
assertFalse("should not accept commit message with newline on end",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("minor: Test.\n").matches());
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test.\t"))
.matches());
assertFalse("should not accept commit message with period on end, ignoring new line",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test.\n"))
.matches());
assertFalse("should not accept commit message with missing prefix",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("Test. Test").matches());
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("Test. Test")).matches());
// test 'testCommitMessageHasSingleLine' verifies that nothing is pass that new line
assertTrue("should accept commit message with new line on end and no period before it",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test\n"))
.matches());
assertTrue("should accept commit message that ends properly",
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher("minor: Test. Test").matches());
ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(fixCommitMessage("minor: Test. Test"))
.matches());
}
@Test
@ -130,12 +139,17 @@ public class CommitValidationTest {
for (RevCommit commit : filterValidCommits(lastCommits)) {
final String commitId = commit.getId().getName();
final String commitMessage = commit.getFullMessage();
final Matcher matcher = ACCEPTED_COMMIT_MESSAGE_PATTERN.matcher(commitMessage);
final Matcher matcher = ACCEPTED_COMMIT_MESSAGE_PATTERN
.matcher(fixCommitMessage(commitMessage));
assertTrue(getInvalidCommitMessageFormattingError(commitId, commitMessage),
matcher.matches());
}
}
private static String fixCommitMessage(String fullMessage) {
return fullMessage.split("\\r?\\n")[0];
}
@Test
public void testCommitMessageHasSingleLine() {
for (RevCommit commit : filterValidCommits(lastCommits)) {