commit feb909cfa2d40274d0de4676cb035257ef7663b6
author David Pursehouse <dpursehouse@collab.net> Mon Apr 15 11:31:34 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed May 08 11:40:37 2019 +0900
tree 235ee662318d35f37fae013e61bee46957c89096
parent cc00aedfc943e69bf5cf8f02e877f5b2f5613403

DownstreamCreatorIT: Don't inject CurrentUser

Use the user member provided by AbstractDaemonTest.

Change-Id: Ie07e54da6102d29959e2a9a658925d9ac0f376ed

src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
index 4b7a4ec..af7099f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -38,11 +38,9 @@
 import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.group.SystemGroupBackend;
 import com.google.gerrit.testing.TestTimeUtil;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.googlesource.gerrit.plugins.automerger.helpers.ConfigOption;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -63,7 +61,6 @@
     name = "automerger",
     sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule")
 public class DownstreamCreatorIT extends LightweightPluginDaemonTest {
-  @Inject private Provider<CurrentUser> user;
   @Inject private GroupOperations groupOperations;
 
   @Test
@@ -834,9 +831,9 @@
     initialResult.assertOkStatus();
     merge(initialResult);
 
-    // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
+    // Create normalUserGroup, containing user, and contextUserGroup, containing contextUser
     String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
-    gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
+    gApi.groups().id(normalUserGroup).addMembers(user.id.toString());
     AccountApi contextUserApi = gApi.accounts().create("someContextUser");
     String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
@@ -903,9 +900,9 @@
     initialResult.assertOkStatus();
     merge(initialResult);
 
-    // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
+    // Create normalUserGroup, containing user, and contextUserGroup, containing contextUser
     String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
-    gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
+    gApi.groups().id(normalUserGroup).addMembers(user.id.toString());
     AccountApi contextUserApi = gApi.accounts().create("randomContextUser");
     String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
@@ -1000,7 +997,7 @@
 
     // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
     String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
-    gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
+    gApi.groups().id(normalUserGroup).addMembers(user.id.toString());
     AccountApi contextUserApi = gApi.accounts().create("asdfContextUser");
     String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);