commit 48c0b46e2e2574156be1198934f58a96c3816e05
author Dave Borowitz <dborowitz@google.com> Tue May 14 17:28:56 2019 +0200
committer Dave Borowitz <dborowitz@google.com> Fri May 17 13:44:13 2019 +0200
tree ac7e01320ce1a4f658e85ce541d9f5980ce76345
parent cb16b8133331a8bf9033b04f1a0573664bf14489

Inline permission methods from AbstractDaemonTest

Change-Id: Ia2cc6bc74cfa16ba334f9bc4ad21821bf7657489

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 2d04522..856a223 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.common.truth.Truth8.assertThat;
+import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.blockLabel;
 import static com.google.gerrit.extensions.client.ListChangesOption.ALL_REVISIONS;
 import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_COMMIT;
 import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION;
@@ -37,6 +38,7 @@
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.acceptance.testsuite.group.GroupOperations;
 import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.api.accounts.AccountApi;
 import com.google.gerrit.extensions.api.changes.ChangeApi;
@@ -612,7 +614,15 @@
     pushDefaultConfig("automerger.config", manifestNameKey.get(), projectName, "ds_one", "ds_two");
 
     // Block Code Review label to test restrictions
-    blockLabel("Code-Review", -2, 2, SystemGroupBackend.CHANGE_OWNER, "refs/heads/*", project);
+    projectOperations
+        .project(project)
+        .forUpdate()
+        .add(
+            blockLabel("Code-Review")
+                .ref("refs/heads/*")
+                .group(SystemGroupBackend.CHANGE_OWNER)
+                .range(-2, 2))
+        .update();
 
     // After we upload our config, we upload a new change to create the downstreams
     PushOneCommit.Result masterResult =
@@ -807,14 +817,16 @@
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant exclusive +2 to context user
-    grantLabel(
-        "Code-Review",
-        -2,
-        2,
-        projectNameKey,
-        "refs/heads/ds_one",
-        AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id),
-        true);
+    projectOperations
+        .project(projectNameKey)
+        .forUpdate()
+        .add(
+            TestProjectUpdate.allowLabel("Code-Review")
+                .ref("refs/heads/ds_one")
+                .group(AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id))
+                .range(-2, 2)
+                .exclusive(true))
+        .update();
     pushContextUserConfig(
         manifestNameKey.get(), projectName, contextUserApi.get()._accountId.toString());
 
@@ -872,14 +884,15 @@
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant +2 to context user, since it doesn't have it by default
-    grantLabel(
-        "Code-Review",
-        -2,
-        2,
-        projectNameKey,
-        "refs/heads/*",
-        AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id),
-        false);
+    projectOperations
+        .project(projectNameKey)
+        .forUpdate()
+        .add(
+            TestProjectUpdate.allowLabel("Code-Review")
+                .ref("refs/heads/*")
+                .group(AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id))
+                .range(-2, 2))
+        .update();
     pushContextUserConfig(
         manifestNameKey.get(), projectName, contextUserApi.get()._accountId.toString());
 
@@ -963,14 +976,15 @@
     gApi.groups().id(contextUserGroup).addMembers(contextUserApi.get().name);
 
     // Grant +2 to context user, since it doesn't have it by default
-    grantLabel(
-        "Code-Review",
-        -2,
-        2,
-        projectNameKey,
-        "refs/heads/*",
-        AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id),
-        false);
+    projectOperations
+        .project(projectNameKey)
+        .forUpdate()
+        .add(
+            TestProjectUpdate.allowLabel("Code-Review")
+                .ref("refs/heads/*")
+                .group(AccountGroup.UUID.parse(gApi.groups().id(contextUserGroup).get().id))
+                .range(-2, 2))
+        .update();
     pushContextUserConfig(
         manifestNameKey.get(), projectName, contextUserApi.get()._accountId.toString());