Adjust email tests to have new footers
Added upstream in I70119346.
The footers are removed from the tests completely so that the tests
don't break every time the footers are changed upstream (those footers
are not related to those tests).
Change-Id: Ie9b79154dd6f99e57136a1a5ffb35369e033cf24
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
index 390e94b..b706898 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
@@ -64,6 +64,9 @@
@Inject private GroupOperations groupOperations;
@Inject private ProjectOperations projectOperations;
+ private static final String GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE =
+ "Gerrit-MessageType: combinedCheckStateUpdate";
+
private TestAccount bot;
private TestAccount owner;
private TestAccount ignoringReviewer;
@@ -570,18 +573,18 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.SUCCESSFUL)
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.SUCCESSFUL, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.SUCCESSFUL, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.SUCCESSFUL)
+ allChecksOverviewHtml(
- ImmutableMap.of(CheckState.SUCCESSFUL, ImmutableList.of(checkerName)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.SUCCESSFUL, ImmutableList.of(checkerName))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -600,7 +603,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -609,11 +612,11 @@
+ CheckState.FAILED
+ ".\n"
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerName
@@ -621,8 +624,8 @@
+ CheckState.FAILED
+ ".</p>"
+ allChecksOverviewHtml(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -649,7 +652,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -660,11 +663,11 @@
+ CheckState.FAILED
+ ".\n"
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <a href=\""
+ checkerUrl
@@ -674,8 +677,8 @@
+ CheckState.FAILED
+ ".</p>"
+ allChecksOverviewHtml(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -696,7 +699,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -707,11 +710,11 @@
+ checkMessage
+ "\n"
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerName
@@ -721,8 +724,8 @@
+ checkMessage
+ "</p>"
+ allChecksOverviewHtml(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -743,7 +746,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -754,11 +757,11 @@
+ checkUrl
+ " ).\n"
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerName
@@ -769,8 +772,8 @@
+ "</a>.</p>"
+ allChecksOverviewHtml(
ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)),
- ImmutableMap.of(checkerName, checkUrl))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(checkerName, checkUrl)));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -789,7 +792,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.WARNING)
+ "\n"
+ "Checker "
@@ -798,11 +801,11 @@
+ CheckState.FAILED
+ ".\n"
+ allChecksOverviewText(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.WARNING)
+ "<p>Checker <strong>"
+ checkerName
@@ -810,8 +813,8 @@
+ CheckState.FAILED
+ ".</p>"
+ allChecksOverviewHtml(
- ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableMap.of(CheckState.FAILED, ImmutableList.of(checkerName))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -842,26 +845,26 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.WARNING)
+ allChecksOverviewText(
ImmutableMap.of(
CheckState.SUCCESSFUL,
ImmutableList.of(checkerNameRequired),
CheckState.FAILED,
- ImmutableList.of(checkerNameOptional)))
- + textEmailFooterForCombinedCheckStateUpdate());
+ ImmutableList.of(checkerNameOptional))));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.WARNING)
+ allChecksOverviewHtml(
ImmutableMap.of(
CheckState.SUCCESSFUL,
ImmutableList.of(checkerNameRequired),
CheckState.FAILED,
- ImmutableList.of(checkerNameOptional)))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ ImmutableList.of(checkerNameOptional))));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -897,7 +900,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -905,19 +908,19 @@
+ " updated the check state to "
+ CheckState.FAILED
+ ".\n"
- + allChecksOverviewText(expectedCheckersByState)
- + textEmailFooterForCombinedCheckStateUpdate());
+ + allChecksOverviewText(expectedCheckersByState));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerNameFailed
+ "</strong> updated the check state to "
+ CheckState.FAILED
+ ".</p>"
- + allChecksOverviewHtml(expectedCheckersByState)
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ + allChecksOverviewHtml(expectedCheckersByState));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -974,7 +977,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -982,19 +985,19 @@
+ " updated the check state to "
+ CheckState.FAILED
+ ".\n"
- + allChecksOverviewText(expectedCheckersByState)
- + textEmailFooterForCombinedCheckStateUpdate());
+ + allChecksOverviewText(expectedCheckersByState));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerNameFailed
+ "</strong> updated the check state to "
+ CheckState.FAILED
+ ".</p>"
- + allChecksOverviewHtml(expectedCheckersByState)
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ + allChecksOverviewHtml(expectedCheckersByState));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -1042,7 +1045,7 @@
Message message = messages.get(0);
assertThat(message.body())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedText(CombinedCheckState.FAILED)
+ "\n"
+ "Checker "
@@ -1050,11 +1053,11 @@
+ " updated the check state to "
+ CheckState.FAILED
+ ".\n"
- + allChecksOverviewText(expectedCheckersByState)
- + textEmailFooterForCombinedCheckStateUpdate());
+ + allChecksOverviewText(expectedCheckersByState));
+ assertThat(message.body()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
assertThat(message.htmlBody())
- .isEqualTo(
+ .contains(
combinedCheckStateUpdatedHtml(CombinedCheckState.FAILED)
+ "<p>Checker <strong>"
+ checkerNameFailed
@@ -1064,8 +1067,8 @@
+ allChecksOverviewHtml(
expectedCheckersByState,
ImmutableMap.of(
- checkerNameRunningFoo, checkUrlFoo, checkerNameRunningBar, checkUrlBar))
- + htmlEmailFooterForCombinedCheckStateUpdate());
+ checkerNameRunningFoo, checkUrlFoo, checkerNameRunningBar, checkUrlBar)));
+ assertThat(message.htmlBody()).contains(GERRIT_MESSAGE_TYPE_COMBINED_CHECK_STATE_UPDATE);
}
@Test
@@ -1138,53 +1141,6 @@
return b.toString();
}
- private String textEmailFooterForCombinedCheckStateUpdate() {
- return "\n"
- + "Change subject: "
- + change.getSubject()
- + "\n"
- + "......................................................................\n"
- + "-- \n"
- + "To view, visit "
- + changeUrl(change)
- + "\n"
- + "To unsubscribe, or for help writing mail filters, visit "
- + canonicalWebUrl.get()
- + "settings\n"
- + "\n"
- + "Gerrit-Project: "
- + project.get()
- + "\n"
- + "Gerrit-Branch: "
- + change.getDest().shortName()
- + "\n"
- + "Gerrit-Change-Id: "
- + change.getKey().get()
- + "\n"
- + "Gerrit-Change-Number: "
- + change.getChangeId()
- + "\n"
- + "Gerrit-PatchSet: "
- + patchSetId.get()
- + "\n"
- + "Gerrit-Owner: "
- + owner.fullName()
- + " <"
- + owner.email()
- + ">\n"
- + "Gerrit-Reviewer: "
- + ignoringReviewer.fullName()
- + " <"
- + ignoringReviewer.email()
- + ">\n"
- + "Gerrit-Reviewer: "
- + reviewer.fullName()
- + " <"
- + reviewer.email()
- + ">\n"
- + "Gerrit-MessageType: combinedCheckStateUpdate\n";
- }
-
private String combinedCheckStateUpdatedHtml(CombinedCheckState combinedCheckState) {
return "<p>The combined check state has been updated to <strong>"
+ combinedCheckState
@@ -1255,54 +1211,6 @@
return "<p><a href=\"" + changeUrl(change) + "\">View Change</a></p>";
}
- private String htmlEmailFooterForCombinedCheckStateUpdate() {
- return htmlViewChangeButton()
- + "<p>To view, visit <a href=\""
- + changeUrl(change)
- + "\">change "
- + change.getChangeId()
- + "</a>."
- + " To unsubscribe, or for help writing mail filters, visit <a href=\""
- + canonicalWebUrl.get()
- + "settings\">settings</a>.</p>"
- + "<div itemscope itemtype=\"http://schema.org/EmailMessage\">"
- + "<div itemscope itemprop=\"action\" itemtype=\"http://schema.org/ViewAction\">"
- + "<link itemprop=\"url\" href=\""
- + changeUrl(change)
- + "\"/>"
- + "<meta itemprop=\"name\" content=\"View Change\"/>"
- + "</div>"
- + "</div>\n\n"
- + "<div style=\"display:none\"> Gerrit-Project: "
- + project.get()
- + " </div>\n"
- + "<div style=\"display:none\"> Gerrit-Branch: "
- + change.getDest().shortName()
- + " </div>\n"
- + "<div style=\"display:none\"> Gerrit-Change-Id: "
- + change.getKey().get()
- + " </div>\n"
- + "<div style=\"display:none\"> Gerrit-Change-Number: "
- + change.getChangeId()
- + " </div>\n"
- + "<div style=\"display:none\"> Gerrit-PatchSet: "
- + patchSetId.get()
- + " </div>\n"
- + "<div style=\"display:none\"> Gerrit-Owner: Administrator <admin@example.com> </div>\n"
- + "<div style=\"display:none\"> Gerrit-Reviewer: "
- + ignoringReviewer.fullName()
- + " <"
- + ignoringReviewer.email()
- + "> </div>\n"
- + "<div style=\"display:none\"> Gerrit-Reviewer: "
- + reviewer.fullName()
- + " <"
- + reviewer.email()
- + "> </div>\n"
- + "<div style=\"display:none\"> Gerrit-MessageType: combinedCheckStateUpdate </div>\n"
- + "\n";
- }
-
private String changeUrl(Change change) {
return canonicalWebUrl.get() + "c/" + change.getProject().get() + "/+/" + change.getChangeId();
}
