commit ebd959adac2c3eaaca8447ac3fdc801a1b533736
author Edwin Kempin <ekempin@google.com> Mon Sep 30 11:37:55 2019 +0200
committer Edwin Kempin <ekempin@google.com> Wed Oct 09 09:10:37 2019 +0200
tree ac57a20558879f21bf133f943a1c610aa22afb20
parent c7b712de48c88be470c658949ca15944c28015d4

Test email notifications for rerun check

Rerunning a check may change the combined check state. If the combined
check state is updated we expect an email notification.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ib2bf0fa76844eebb8b45ffd21ffb0f70bc85d9d7

javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java

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 ca1ce0c..922754d 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
@@ -222,7 +222,7 @@
 
     sender.clear();
 
-    // Update one of the checks in a way so that doesn't change the combined check state..
+    // Update one of the checks in a way so that doesn't change the combined check state.
     requestScopeOperations.setApiUser(bot.id());
     CheckInput input = new CheckInput();
     input.checkerUuid = checkerUuid2.get();
@@ -235,6 +235,57 @@
   }
 
   @Test
+  public void combinedCheckUpdatedEmailAfterCheckRerun() throws Exception {
+    // Create a check that sets the combined check state to FAILED.
+    CheckKey checkKey = CheckKey.create(project, patchSetId, checkerUuid1);
+    checkOperations.newCheck(checkKey).state(CheckState.FAILED).upsert();
+    assertThat(getCombinedCheckState()).isEqualTo(CombinedCheckState.FAILED);
+
+    sender.clear();
+
+    // Rerun the check so that the combined check state is changed to IN_PROGRESS.
+    requestScopeOperations.setApiUser(bot.id());
+    checksApiFactory.revision(patchSetId).id(checkKey.checkerUuid()).rerun();
+    assertThat(getCombinedCheckState()).isEqualTo(CombinedCheckState.IN_PROGRESS);
+
+    // Expect one email because the combined check state was updated.
+    List<Message> messages = sender.getMessages();
+    assertThat(messages).hasSize(1);
+
+    Message message = messages.get(0);
+    assertThat(message.from().getName()).isEqualTo(bot.fullName() + " (Code Review)");
+    assertThat(message.body())
+        .contains("The combined check state has been updated to " + CombinedCheckState.IN_PROGRESS);
+    assertThat(message.rcpt())
+        .containsExactly(
+            owner.getEmailAddress(),
+            reviewer.getEmailAddress(),
+            starrer.getEmailAddress(),
+            watcher.getEmailAddress());
+  }
+
+  @Test
+  public void noCombinedCheckUpdatedEmailOnCheckRerunIfCombinedCheckStateIsNotChanged()
+      throws Exception {
+    // Create 2 checks that set the combined check state to FAILED.
+    CheckKey checkKey1 = CheckKey.create(project, patchSetId, checkerUuid1);
+    checkOperations.newCheck(checkKey1).state(CheckState.FAILED).upsert();
+    CheckKey checkKey2 = CheckKey.create(project, patchSetId, checkerUuid2);
+    checkOperations.newCheck(checkKey2).state(CheckState.FAILED).upsert();
+    assertThat(getCombinedCheckState()).isEqualTo(CombinedCheckState.FAILED);
+
+    sender.clear();
+
+    // Rerun only one check so that the combined check state stays FAILED.
+    requestScopeOperations.setApiUser(bot.id());
+    checksApiFactory.revision(patchSetId).id(checkKey1.checkerUuid()).rerun();
+    assertThat(getCombinedCheckState()).isEqualTo(CombinedCheckState.FAILED);
+
+    // Expect that no email was sent because the combined check state was not updated.
+    assertThat(sender.getMessages()).isEmpty();
+  }
+
+  @Test
   public void postCheckRespectsNotifySettings() throws Exception {
     testNotifySettingsForPostCheck(NotifyHandling.ALL, owner, reviewer, starrer, watcher);
     testNotifySettingsForPostCheck(NotifyHandling.OWNER, owner);