Merge "Refactor to use mapping of item to index instead of harcoding index"
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 348e840..a63647e 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ChecksEmailIT.java
@@ -77,7 +77,7 @@
   public void setup() throws Exception {
     // Create a bot account, create a bots group and add the bot as member and allow the bots group
     // to post checks.
-    bot = accountCreator.create("bot", "bot@test.com", "Bot");
+    bot = accountCreator.create("bot", "bot@test.com", "Bot", null);
     AccountGroup.UUID botsAccountGroupUuid =
         groupOperations.newGroup().name("bots").addMember(bot.id()).create();
     projectOperations
@@ -93,16 +93,16 @@
     patchSetId = result.getPatchSetId();
 
     // Add a reviewer.
-    reviewer = accountCreator.create("reviewer", "reviewer@test.com", "Reviewer");
+    reviewer = accountCreator.create("reviewer", "reviewer@test.com", "Reviewer", null);
     gApi.changes().id(patchSetId.changeId().get()).addReviewer(reviewer.username());
 
     // Star the change from some user.
-    starrer = accountCreator.create("starred", "starrer@test.com", "Starrer");
+    starrer = accountCreator.create("starred", "starrer@test.com", "Starrer", null);
     requestScopeOperations.setApiUser(starrer.id());
     gApi.accounts().self().starChange(patchSetId.changeId().toString());
 
     // Watch all comments of change from some user.
-    watcher = accountCreator.create("watcher", "watcher@test.com", "Watcher");
+    watcher = accountCreator.create("watcher", "watcher@test.com", "Watcher", null);
     requestScopeOperations.setApiUser(watcher.id());
     ProjectWatchInfo projectWatchInfo = new ProjectWatchInfo();
     projectWatchInfo.project = project.get();
@@ -113,7 +113,10 @@
     // Watch only change creations from some user --> user doesn't get notified by checks plugin.
     TestAccount changeCreationWatcher =
         accountCreator.create(
-            "changeCreationWatcher", "changeCreationWatcher@test.com", "Change Creation Watcher");
+            "changeCreationWatcher",
+            "changeCreationWatcher@test.com",
+            "Change Creation Watcher",
+            null);
     requestScopeOperations.setApiUser(changeCreationWatcher.id());
     projectWatchInfo = new ProjectWatchInfo();
     projectWatchInfo.project = project.get();
@@ -122,7 +125,7 @@
     gApi.accounts().self().setWatchedProjects(ImmutableList.of(projectWatchInfo));
 
     // Add a reviewer that ignores the change --> user doesn't get notified by checks plugin.
-    ignoringReviewer = accountCreator.create("ignorer", "ignorer@test.com", "Ignorer");
+    ignoringReviewer = accountCreator.create("ignorer", "ignorer@test.com", "Ignorer", null);
     requestScopeOperations.setApiUser(admin.id());
     gApi.changes().id(patchSetId.changeId().get()).addReviewer(ignoringReviewer.username());
     requestScopeOperations.setApiUser(ignoringReviewer.id());