From d12f3dcbef7522d65aad9f120e23e75aad9055c8 Mon Sep 17 00:00:00 2001 From: Sven Selberg Date: Thu, 9 Apr 2020 10:00:33 +0200 Subject: [PATCH] Remove duplicate test method removeAnonymousRead Use identical method AbstractDaemonTest#blockAnonymousRead() instead. Change-Id: Ibe7260bea6e54c2dfd8ebcabb96999183421cf70 --- .../acceptance/rest/project/AbstractPushTag.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java b/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java index 404ded3ed9..9420304681 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java @@ -21,16 +21,13 @@ import static com.google.gerrit.acceptance.GitUtil.pushHead; import static com.google.gerrit.acceptance.GitUtil.updateAnnotatedTag; import static com.google.gerrit.acceptance.rest.project.AbstractPushTag.TagType.ANNOTATED; import static com.google.gerrit.acceptance.rest.project.AbstractPushTag.TagType.LIGHTWEIGHT; -import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.common.base.MoreObjects; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.common.data.Permission; -import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.RefNames; -import com.google.gerrit.server.project.testing.Util; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.PushResult; @@ -58,7 +55,7 @@ public abstract class AbstractPushTag extends AbstractDaemonTest { public void setUpTestEnvironment() throws Exception { initialHead = getRemoteHead(); tagType = getTagType(); - removeAnonymousRead(); + blockAnonymousRead(); } protected abstract TagType getTagType(); @@ -250,17 +247,6 @@ public abstract class AbstractPushTag extends AbstractDaemonTest { removePermission(project, "refs/tags/*", Permission.PUSH); } - private void removeAnonymousRead() throws Exception { - AccountGroup.UUID anonymous = systemGroupBackend.getGroup(ANONYMOUS_USERS).getUUID(); - AccountGroup.UUID registered = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID(); - String allRefs = RefNames.REFS + "*"; - try (ProjectConfigUpdate u = updateProject(project)) { - Util.block(u.getConfig(), Permission.READ, anonymous, allRefs); - Util.allow(u.getConfig(), Permission.READ, registered, allRefs); - u.save(); - } - } - private void commit(PersonIdent ident, String subject) throws Exception { commitBuilder().ident(ident).message(subject + " (" + System.nanoTime() + ")").create(); }