Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restrict merge PR commit titles if required by the jcheck configuration #949

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -22,21 +22,15 @@
*/
package org.openjdk.skara.jcheck;

import org.openjdk.skara.vcs.Author;
import org.openjdk.skara.vcs.Commit;
import org.openjdk.skara.vcs.CommitMetadata;
import org.openjdk.skara.vcs.Hash;
import org.openjdk.skara.vcs.openjdk.CommitMessage;
import org.openjdk.skara.vcs.openjdk.CommitMessageParsers;

import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.openjdk.skara.vcs.*;
import org.openjdk.skara.vcs.openjdk.*;

import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.time.ZonedDateTime;
import java.io.IOException;
import java.time.ZonedDateTime;
import java.util.*;

import static org.junit.jupiter.api.Assertions.*;

class MergeMessageCheckTests {
private static final List<String> CONFIGURATION = List.of(
@@ -94,14 +88,13 @@ void incorrectMessageShouldFail() throws IOException {
}

@Test
void multiLineMessageShouldFail() throws IOException {
void multiLineMessageShouldWork() throws IOException {
var commit = commit(List.of("Merge", "", "This is a summary"));
var message = message(commit);
var check = new MergeMessageCheck();
var issues = toList(check.check(commit, message, conf(), null));

assertEquals(1, issues.size());
assertTrue(issues.get(0) instanceof MergeMessageIssue);
assertEquals(List.of(), issues);
}

@Test