commit 592e947ef2c9267014f8f65c05b64b5f488c6bfd
author Dave Borowitz <dborowitz@google.com> Wed Nov 14 14:23:38 2018 -0800
committer Dave Borowitz <dborowitz@google.com> Wed Nov 14 14:24:05 2018 -0800
tree 2b1c92a8d055548368179df5b27b3da6c3904816
parent 86b3407147c7f711d9e9df54744f48e70a18de93

DownstreamCreatorIT: Use new GroupOperations class

Change-Id: I379638c5463d46674921204b7f09dfbfaefed4b5

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 ac6a95f..48ff6c0 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -22,6 +22,7 @@
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.PushOneCommit;
 import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.testsuite.group.GroupOperations;
 import com.google.gerrit.extensions.api.accounts.AccountApi;
 import com.google.gerrit.extensions.api.changes.ChangeApi;
 import com.google.gerrit.extensions.api.changes.RebaseInput;
@@ -63,6 +64,7 @@
     sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule")
 public class DownstreamCreatorIT extends LightweightPluginDaemonTest {
   @Inject private Provider<CurrentUser> user;
+  @Inject private GroupOperations groupOperations;
 
   @Test
   public void testExpectedFlow() throws Exception {
@@ -833,10 +835,10 @@
     merge(initialResult);
 
     // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
-    String normalUserGroup = createGroup("normalUserGroup");
+    String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
     gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
     AccountApi contextUserApi = gApi.accounts().create("someContextUser");
-    String contextUserGroup = createGroup("contextUserGroup");
+    String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant exclusive +2 to context user
@@ -902,10 +904,10 @@
     merge(initialResult);
 
     // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
-    String normalUserGroup = createGroup("normalUserGroup");
+    String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
     gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
     AccountApi contextUserApi = gApi.accounts().create("randomContextUser");
-    String contextUserGroup = createGroup("contextUserGroup");
+    String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant +2 to context user, since it doesn't have it by default
@@ -997,10 +999,10 @@
     testRepo.reset(initial);
 
     // Create normalUserGroup, containing current user, and contextUserGroup, containing contextUser
-    String normalUserGroup = createGroup("normalUserGroup");
+    String normalUserGroup = groupOperations.newGroup().name("normalUserGroup").create().get();
     gApi.groups().id(normalUserGroup).addMembers(user.get().getAccountId().toString());
     AccountApi contextUserApi = gApi.accounts().create("asdfContextUser");
-    String contextUserGroup = createGroup("contextUserGroup");
+    String contextUserGroup = groupOperations.newGroup().name("contextUserGroup").create().get();
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant +2 to context user, since it doesn't have it by default