opendev/gerrit
Code Issues Proposed changes

Push down AbstractDaemonTest#grantTagPermissions to callers

Browse Source 
Change-Id: I73285200bf7c8617faa56662b5a0c6c1255e7db1
This commit is contained in:
Han-Wen Nienhuys
2018-04-18 11:02:50 +02:00
parent f66222fdd6
commit 95f643fa52
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -27,7 +27,6 @@ import static com.google.gerrit.server.project.testing.Util.value;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import com.github.rholder.retry.BlockStrategy;
import com.google.common.base.Strings;
@@ -1222,13 +1221,6 @@ public abstract class AbstractDaemonTest {
return getRemoteHead(project, "master");
}
protected void grantTagPermissions() throws Exception {
grant(project, R_TAGS + "*", Permission.CREATE);
grant(project, R_TAGS + "", Permission.DELETE);
grant(project, R_TAGS + "*", Permission.CREATE_TAG);
grant(project, R_TAGS + "*", Permission.CREATE_SIGNED_TAG);
}
protected void assertMailReplyTo(Message message, String email) throws Exception {
assertThat(message.headers()).containsKey("Reply-To");
EmailHeader.String replyTo = (EmailHeader.String) message.headers().get("Reply-To");

4
javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java
View File

@@ -15,10 +15,12 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit.Result;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.projects.TagInput;
import com.google.gerrit.reviewdb.client.Branch;
@@ -47,7 +49,7 @@ public class ChangeIncludedInIT extends AbstractDaemonTest {
.containsExactly("master");
assertThat(gApi.changes().id(result.getChangeId()).includedIn().tags).isEmpty();
grantTagPermissions();
grant(project, R_TAGS + "*", Permission.CREATE_TAG);
gApi.projects().name(project.get()).tag("test-tag").create(new TagInput());
assertThat(gApi.changes().id(result.getChangeId()).includedIn().tags)

4
javatests/com/google/gerrit/acceptance/rest/project/CommitIncludedInIT.java
View File

@@ -15,10 +15,12 @@
package com.google.gerrit.acceptance.rest.project;
import static com.google.common.truth.Truth.assertThat;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit.Result;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.changes.IncludedInInfo;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.projects.TagInput;
@@ -46,7 +48,7 @@ public class CommitIncludedInIT extends AbstractDaemonTest {
assertThat(getIncludedIn(result.getCommit().getId()).branches).containsExactly("master");
assertThat(getIncludedIn(result.getCommit().getId()).tags).isEmpty();
grantTagPermissions();
grant(project, R_TAGS + "*", Permission.CREATE_TAG);
gApi.projects().name(result.getChange().project().get()).tag("test-tag").create(new TagInput());
assertThat(getIncludedIn(result.getCommit().getId()).tags).containsExactly("test-tag");

7
javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java
View File

@@ -370,4 +370,11 @@ public class TagsIT extends AbstractDaemonTest {
// Expected
}
}
private void grantTagPermissions() throws Exception {
grant(project, R_TAGS + "*", Permission.CREATE);
grant(project, R_TAGS + "", Permission.DELETE);
grant(project, R_TAGS + "*", Permission.CREATE_TAG);
grant(project, R_TAGS + "*", Permission.CREATE_SIGNED_TAG);
}
}