diff --git a/java/com/google/gerrit/server/project/testing/Util.java b/java/com/google/gerrit/server/project/testing/Util.java index d3f3902186..b011dc9ae4 100644 --- a/java/com/google/gerrit/server/project/testing/Util.java +++ b/java/com/google/gerrit/server/project/testing/Util.java @@ -17,13 +17,9 @@ package com.google.gerrit.server.project.testing; import com.google.gerrit.common.data.LabelFunction; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; -import com.google.gerrit.reviewdb.client.AccountGroup; import java.util.Arrays; public class Util { - public static final AccountGroup.UUID ADMIN = AccountGroup.uuid("test.admin"); - public static final AccountGroup.UUID DEVS = AccountGroup.uuid("test.devs"); - public static final LabelType codeReview() { return category( "Code-Review", diff --git a/javatests/com/google/gerrit/server/permissions/RefControlTest.java b/javatests/com/google/gerrit/server/permissions/RefControlTest.java index 07b0b51bdf..afbaa99ffd 100644 --- a/javatests/com/google/gerrit/server/permissions/RefControlTest.java +++ b/javatests/com/google/gerrit/server/permissions/RefControlTest.java @@ -33,8 +33,6 @@ import static com.google.gerrit.reviewdb.client.RefNames.REFS_CONFIG; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.CHANGE_OWNER; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; -import static com.google.gerrit.server.project.testing.Util.ADMIN; -import static com.google.gerrit.server.project.testing.Util.DEVS; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.Lists; @@ -72,6 +70,9 @@ import org.junit.Before; import org.junit.Test; public class RefControlTest { + private static final AccountGroup.UUID ADMIN = AccountGroup.uuid("test.admin"); + private static final AccountGroup.UUID DEVS = AccountGroup.uuid("test.devs"); + private void assertAdminsAreOwnersAndDevsAreNot() throws Exception { ProjectControl uBlah = user(localKey, DEVS); ProjectControl uAdmin = user(localKey, DEVS, ADMIN);