Skip to content

Commit

Permalink
Make subject tags consistent
Browse files Browse the repository at this point in the history 
Reviewed-by: ehelin
  • Loading branch information
@rwestberg
rwestberg committed Sep 17, 2019
1 parent 2c1e9ac commit 7ee97c3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java
View file
Expand Up @@ -190,7 +190,7 @@ void addFull(URI webrev) {
var body = ArchiveMessages.composeRebaseComment(prInstance, webrev); var body = ArchiveMessages.composeRebaseComment(prInstance, webrev);
var id = getMessageId(prInstance.headHash()); var id = getMessageId(prInstance.headHash());
var parent = topEmail(); var parent = topEmail();
var email = Email.reply(parent, "Re: " + latestHeadPrefix() + ": RFR: " + prInstance.pr().getTitle(), body) var email = Email.reply(parent, "Re: " + latestHeadPrefix() + " RFR: " + prInstance.pr().getTitle(), body)
.sender(sender) .sender(sender)
.author(getAuthorAddress(prInstance.pr().getAuthor())) .author(getAuthorAddress(prInstance.pr().getAuthor()))
.recipient(parent.author()) .recipient(parent.author())
Expand All @@ -207,7 +207,7 @@ void addIncremental(URI fullWebrev, URI incrementalWebrev) {
var body = ArchiveMessages.composeIncrementalComment(latestHead(), prInstance, fullWebrev, incrementalWebrev); var body = ArchiveMessages.composeIncrementalComment(latestHead(), prInstance, fullWebrev, incrementalWebrev);
var id = getMessageId(prInstance.headHash()); var id = getMessageId(prInstance.headHash());
var parent = topEmail(); var parent = topEmail();
var email = Email.reply(parent, "Re: " + latestHeadPrefix() + ": RFR: " + prInstance.pr().getTitle(), body) var email = Email.reply(parent, "Re: " + latestHeadPrefix() + " RFR: " + prInstance.pr().getTitle(), body)
.sender(sender) .sender(sender)
.author(getAuthorAddress(prInstance.pr().getAuthor())) .author(getAuthorAddress(prInstance.pr().getAuthor()))
.recipient(parent.author()) .recipient(parent.author())
Expand Down Expand Up @@ -332,7 +332,7 @@ void addReview(Review review) {
// Approvals by Reviewers get special treatment - post these as top-level comments // Approvals by Reviewers get special treatment - post these as top-level comments
if (review.verdict() == Review.Verdict.APPROVED && isReviewer) { if (review.verdict() == Review.Verdict.APPROVED && isReviewer) {
parent = topEmail(); parent = topEmail();
subject = "Re: [Approved]: " + "RFR: " + prInstance.pr().getTitle(); subject = "Re: [Approved] " + "RFR: " + prInstance.pr().getTitle();
} }


var userName = contributor != null ? contributor.username() : review.reviewer().userName() + "@" + censusInstance.namespace().name(); var userName = contributor != null ? contributor.username() : review.reviewer().userName() + "@" + censusInstance.namespace().name();
Expand Down
12 changes: 6 additions & 6 deletions bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java
View file
Expand Up @@ -504,7 +504,7 @@ void commentThreading(TestInfo testInfo) throws IOException {
var thread3 = conversations.get(0).replies(mail).get(2); var thread3 = conversations.get(0).replies(mail).get(2);
assertEquals("Re: RFR: This is a pull request", thread3.subject()); assertEquals("Re: RFR: This is a pull request", thread3.subject());
var thread4 = conversations.get(0).replies(mail).get(3); var thread4 = conversations.get(0).replies(mail).get(3);
assertEquals("Re: [Approved]: RFR: This is a pull request", thread4.subject()); assertEquals("Re: [Approved] RFR: This is a pull request", thread4.subject());
} }
} }


Expand Down Expand Up @@ -795,9 +795,9 @@ void incrementalChanges(TestInfo testInfo) throws IOException {
assertEquals(1, updatedConversations.size()); assertEquals(1, updatedConversations.size());
var conversation = updatedConversations.get(0); var conversation = updatedConversations.get(0);
assertEquals(6, conversation.allMessages().size()); assertEquals(6, conversation.allMessages().size());
assertEquals("Re: [Rev 01]: RFR: This is a pull request", conversation.allMessages().get(1).subject()); assertEquals("Re: [Rev 01] RFR: This is a pull request", conversation.allMessages().get(1).subject());
assertEquals("Re: [Rev 01]: RFR: This is a pull request", conversation.allMessages().get(2).subject(), conversation.allMessages().get(2).toString()); assertEquals("Re: [Rev 01] RFR: This is a pull request", conversation.allMessages().get(2).subject(), conversation.allMessages().get(2).toString());
assertEquals("Re: [Rev 04]: RFR: This is a pull request", conversation.allMessages().get(5).subject()); assertEquals("Re: [Rev 04] RFR: This is a pull request", conversation.allMessages().get(5).subject());
} }
} }


Expand Down Expand Up @@ -884,7 +884,7 @@ void rebased(TestInfo testInfo) throws IOException {
assertEquals(sender, newMail.sender()); assertEquals(sender, newMail.sender());
assertFalse(newMail.hasHeader("PR-Head-Hash")); assertFalse(newMail.hasHeader("PR-Head-Hash"));
} }
assertEquals("Re: [Rev 01]: RFR: This is a pull request", conversations.get(0).allMessages().get(1).subject()); assertEquals("Re: [Rev 01] RFR: This is a pull request", conversations.get(0).allMessages().get(1).subject());
} }
} }


Expand Down Expand Up @@ -1025,7 +1025,7 @@ void notifyReviewVerdicts(TestInfo testInfo) throws IOException {
if (author.host().supportsReviewBody()) { if (author.host().supportsReviewBody()) {
assertEquals(1, archiveContainsCount(archiveFolder.path(), "Reason 2")); assertEquals(1, archiveContainsCount(archiveFolder.path(), "Reason 2"));
} }
assertEquals(1, archiveContainsCount(archiveFolder.path(), "Re: \\[Approved\\]:")); assertEquals(1, archiveContainsCount(archiveFolder.path(), "Re: \\[Approved\\] RFR:"));


// Yet another change // Yet another change
reviewedPr.addReview(Review.Verdict.DISAPPROVED, "Reason 3"); reviewedPr.addReview(Review.Verdict.DISAPPROVED, "Reason 3");
Expand Down

0 comments on commit 7ee97c3

Please sign in to comment.