Merge "Adapt to Gerrit core change Ia8c03c86"
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerApprovalIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerApprovalIT.java
index 415dcc6..4ceb12a 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerApprovalIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerApprovalIT.java
@@ -34,7 +34,6 @@
import com.google.inject.Inject;
import java.util.Collection;
import java.util.HashMap;
-import java.util.regex.Pattern;
import org.junit.Test;
/** Acceptance test for {@code com.google.gerrit.plugins.codeowners.backend.OnCodeOwnerApproval}. */
@@ -89,7 +88,7 @@
}
@Test
- public void changeMessageExtended_sameCodeOwnerApprovalAppliedAgain() throws Exception {
+ public void changeMessageNotExtended_sameCodeOwnerApprovalAppliedAgain() throws Exception {
codeOwnerConfigOperations
.newCodeOwnerConfig()
.project(project)
@@ -109,21 +108,21 @@
recommend(changeId);
Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
- // Check that a new change message was added.
- assertThat(messages.size()).isEqualTo(messageCount + 1);
+ // Check that no new change message was added.
+ assertThat(messages.size()).isEqualTo(messageCount);
assertThat(Iterables.getLast(messages).message)
.isEqualTo(
String.format(
"Patch Set 1: Code-Review+1\n\n"
- + "By voting Code-Review+1 the following files are still code-owner approved by"
+ + "By voting Code-Review+1 the following files are now code-owner approved by"
+ " %s:\n"
+ "* %s\n",
admin.fullName(), path));
}
@Test
- public void changeMessageExtended_sameCodeOwnerApprovalAppliedAgainTogetherWithOtherLabel()
+ public void changeMessageNotExtended_sameCodeOwnerApprovalAppliedAgainTogetherWithOtherLabel()
throws Exception {
LabelDefinitionInput input = new LabelDefinitionInput();
input.values = ImmutableMap.of("+1", "Other", " 0", "Approved");
@@ -153,30 +152,27 @@
recommend(changeId);
- // Apply the Code-Review+1 approval again and add an unrelated vote.
+ Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
+ assertThat(Iterables.getLast(messages).message)
+ .isEqualTo(
+ String.format(
+ "Patch Set 1: Code-Review+1\n\n"
+ + "By voting Code-Review+1 the following files are now code-owner approved by"
+ + " %s:\n"
+ + "* %s\n",
+ admin.fullName(), path));
+
+ // Apply the Code-Review+1 approval again and add an unrelated vote (Code-Review+1 is ignored).
ReviewInput reviewInput = ReviewInput.recommend();
reviewInput.labels.put("Other", (short) 1);
gApi.changes().id(changeId).current().review(reviewInput);
- Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
- assertThat(Iterables.getLast(messages).message)
- .matches(
- Pattern.quote("Patch Set 1: ")
- + "("
- + Pattern.quote("Code-Review+1 Other+1")
- + "|"
- + Pattern.quote("Other+1 Code-Review+1")
- + ")"
- + Pattern.quote(
- String.format(
- "\n\nBy voting Code-Review+1 the following files are still code-owner approved by"
- + " %s:\n"
- + "* %s\n",
- admin.fullName(), path)));
+ messages = gApi.changes().id(changeId).get().messages;
+ assertThat(Iterables.getLast(messages).message).isEqualTo("Patch Set 1: Other+1");
}
@Test
- public void changeMessageExtended_sameCodeOwnerApprovalAppliedAgainTogetherWithComment()
+ public void changeMessageNotExtended_sameCodeOwnerApprovalAppliedAgainTogetherWithComment()
throws Exception {
LabelDefinitionInput input = new LabelDefinitionInput();
input.values = ImmutableMap.of("+1", "Other", " 0", "Approved");
@@ -206,7 +202,17 @@
recommend(changeId);
- // Apply the Code-Review+1 approval again and add a comment.
+ Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
+ assertThat(Iterables.getLast(messages).message)
+ .isEqualTo(
+ String.format(
+ "Patch Set 1: Code-Review+1\n\n"
+ + "By voting Code-Review+1 the following files are now code-owner approved by"
+ + " %s:\n"
+ + "* %s\n",
+ admin.fullName(), path));
+
+ // Apply the Code-Review+1 approval again and add a comment (Code-Review +1 is ignored)
ReviewInput.CommentInput commentInput = new ReviewInput.CommentInput();
commentInput.line = 1;
commentInput.message = "some comment";
@@ -216,15 +222,8 @@
reviewInput.comments.put(commentInput.path, Lists.newArrayList(commentInput));
gApi.changes().id(changeId).current().review(reviewInput);
- Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
- assertThat(Iterables.getLast(messages).message)
- .isEqualTo(
- String.format(
- "Patch Set 1: Code-Review+1\n\n(1 comment)\n\n"
- + "By voting Code-Review+1 the following files are still code-owner approved by"
- + " %s:\n"
- + "* %s\n",
- admin.fullName(), path));
+ messages = gApi.changes().id(changeId).get().messages;
+ assertThat(Iterables.getLast(messages).message).isEqualTo("Patch Set 1:\n\n(1 comment)");
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerOverrrideIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerOverrrideIT.java
index 08da420..0c55059 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerOverrrideIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/OnCodeOwnerOverrrideIT.java
@@ -76,7 +76,7 @@
@Test
@GerritConfig(name = "plugin.code-owners.overrideApproval", value = "Owners-Override+1")
- public void changeMessageExtendedIfCodeOwnersOverrideIsReApplied() throws Exception {
+ public void changeMessageNotExtendedIfCodeOwnersOverrideIsReApplied() throws Exception {
createOwnersOverrideLabel();
String changeId = createChange().getChangeId();
@@ -88,16 +88,9 @@
// Apply the Owners-Override+1 approval again
gApi.changes().id(changeId).current().review(new ReviewInput().label("Owners-Override", 1));
- // Check that a new change message was added.
+ // Check that a no new change message was added.
Collection<ChangeMessageInfo> messages = gApi.changes().id(changeId).get().messages;
- assertThat(messages.size()).isEqualTo(messageCount + 1);
-
- assertThat(Iterables.getLast(messages).message)
- .isEqualTo(
- String.format(
- "Patch Set 1: Owners-Override+1\n\n"
- + "By voting Owners-Override+1 the code-owners submit requirement is still overridden by %s\n",
- admin.fullName()));
+ assertThat(messages.size()).isEqualTo(messageCount);
}
@Test
