Clean up hardcoded refs/meta/config strings
Change-Id: Ic49dd7f46f35f2b96dbe938b99a93c2229bbf08b
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
index a3de2b4..6892893 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/ProjectIT.java
@@ -28,6 +28,7 @@
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
+import com.google.gerrit.reviewdb.client.RefNames;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Test;
@@ -44,8 +45,8 @@
.get()
.name);
- RevCommit head = getRemoteHead(name, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(name, "refs/meta/config",
+ RevCommit head = getRemoteHead(name, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(name, RefNames.REFS_CONFIG,
null, head);
eventRecorder.assertRefUpdatedEvents(name, "refs/heads/master",
@@ -61,8 +62,8 @@
.get()
.name);
- RevCommit head = getRemoteHead(name, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(name, "refs/meta/config",
+ RevCommit head = getRemoteHead(name, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(name, RefNames.REFS_CONFIG,
null, head);
eventRecorder.assertRefUpdatedEvents(name, "refs/heads/master",
@@ -81,8 +82,8 @@
.get()
.name);
- RevCommit head = getRemoteHead(name, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(name, "refs/meta/config",
+ RevCommit head = getRemoteHead(name, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(name, RefNames.REFS_CONFIG,
null, head);
head = getRemoteHead(name, "refs/heads/master");
@@ -133,7 +134,7 @@
@Test
public void description() throws Exception {
- RevCommit initialHead = getRemoteHead(project, "refs/meta/config");
+ RevCommit initialHead = getRemoteHead(project, RefNames.REFS_CONFIG);
assertThat(gApi.projects()
.name(project.get())
.description())
@@ -148,14 +149,14 @@
.description())
.isEqualTo(in.description);
- RevCommit updatedHead = getRemoteHead(project, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(project.get(), "refs/meta/config",
+ RevCommit updatedHead = getRemoteHead(project, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(project.get(), RefNames.REFS_CONFIG,
initialHead, updatedHead);
}
@Test
public void config() throws Exception {
- RevCommit initialHead = getRemoteHead(project, "refs/meta/config");
+ RevCommit initialHead = getRemoteHead(project, RefNames.REFS_CONFIG);
ConfigInfo info = gApi.projects().name(project.get()).config();
assertThat(info.submitType).isEqualTo(SubmitType.MERGE_IF_NECESSARY);
@@ -166,8 +167,8 @@
info = gApi.projects().name(project.get()).config();
assertThat(info.submitType).isEqualTo(SubmitType.CHERRY_PICK);
- RevCommit updatedHead = getRemoteHead(project, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(project.get(), "refs/meta/config",
+ RevCommit updatedHead = getRemoteHead(project, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(project.get(), RefNames.REFS_CONFIG,
initialHead, updatedHead);
}
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
index 980593f..848b428 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
@@ -27,6 +27,7 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.query.change.ChangeData;
@@ -93,13 +94,13 @@
grant(Permission.SUBMIT, project, "refs/for/refs/meta/config");
git().fetch().setRefSpecs(new RefSpec("refs/meta/config:refs/meta/config")).call();
- testRepo.reset("refs/meta/config");
+ testRepo.reset(RefNames.REFS_CONFIG);
PushOneCommit.Result r = pushTo("refs/for/refs/meta/config%submit");
r.assertOkStatus();
r.assertChange(Change.Status.MERGED, null, admin);
assertSubmitApproval(r.getPatchSetId());
- assertCommit(project, "refs/meta/config");
+ assertCommit(project, RefNames.REFS_CONFIG);
}
@Test
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
index 010d216..dc12979 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
@@ -139,8 +139,8 @@
public void allRefsVisibleNoRefsMetaConfig() throws Exception {
ProjectConfig cfg = projectCache.checkedGet(project).getConfig();
Util.allow(cfg, Permission.READ, REGISTERED_USERS, "refs/*");
- Util.allow(cfg, Permission.READ, admins, "refs/meta/config");
- Util.doNotInherit(cfg, Permission.READ, "refs/meta/config");
+ Util.allow(cfg, Permission.READ, admins, RefNames.REFS_CONFIG);
+ Util.doNotInherit(cfg, Permission.READ, RefNames.REFS_CONFIG);
saveProjectConfig(project, cfg);
setApiUser(user);
@@ -159,7 +159,7 @@
@Test
public void allRefsVisibleWithRefsMetaConfig() throws Exception {
allow(Permission.READ, REGISTERED_USERS, "refs/*");
- allow(Permission.READ, REGISTERED_USERS, "refs/meta/config");
+ allow(Permission.READ, REGISTERED_USERS, RefNames.REFS_CONFIG);
assertRefs(
"HEAD",
@@ -169,7 +169,7 @@
r2 + "meta",
"refs/heads/branch",
"refs/heads/master",
- "refs/meta/config",
+ RefNames.REFS_CONFIG,
"refs/tags/branch-tag",
"refs/tags/master-tag");
}
@@ -284,7 +284,7 @@
r3 + "meta",
"refs/heads/branch",
"refs/heads/master",
- "refs/meta/config",
+ RefNames.REFS_CONFIG,
"refs/tags/branch-tag",
"refs/tags/master-tag");
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java
index 6781ef1..b7f09d1 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java
@@ -28,6 +28,7 @@
import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
+import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.Util;
@@ -47,7 +48,7 @@
Util.allow(cfg, Permission.OWNER, REGISTERED_USERS, "refs/*");
Util.allow(
cfg, Permission.PUSH, REGISTERED_USERS, "refs/for/refs/meta/config");
- Util.allow(cfg, Permission.SUBMIT, REGISTERED_USERS, "refs/meta/config");
+ Util.allow(cfg, Permission.SUBMIT, REGISTERED_USERS, RefNames.REFS_CONFIG);
saveProjectConfig(project, cfg);
setApiUser(user);
@@ -89,7 +90,7 @@
.isEqualTo(desc);
String changeRev = gApi.changes().id(id).get().currentRevision;
String branchRev = gApi.projects().name(project.get())
- .branch("refs/meta/config").get().revision;
+ .branch(RefNames.REFS_CONFIG).get().revision;
assertThat(changeRev).isEqualTo(branchRev);
return id;
}
@@ -145,7 +146,7 @@
private void fetchRefsMetaConfig() throws Exception {
git().fetch().setRefSpecs(new RefSpec("refs/meta/config:refs/meta/config"))
.call();
- testRepo.reset("refs/meta/config");
+ testRepo.reset(RefNames.REFS_CONFIG);
}
private Config readProjectConfig() throws Exception {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/AccessIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/AccessIT.java
index 975dc2b..c78b291 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/AccessIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/AccessIT.java
@@ -32,6 +32,7 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.group.SystemGroupBackend;
@@ -72,7 +73,7 @@
@Test
public void addAccessSection() throws Exception {
Project.NameKey p = new Project.NameKey(newProjectName);
- RevCommit initialHead = getRemoteHead(p, "refs/meta/config");
+ RevCommit initialHead = getRemoteHead(p, RefNames.REFS_CONFIG);
ProjectAccessInput accessInput = newProjectAccessInput();
AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
@@ -82,8 +83,8 @@
assertThat(pApi.access().local).isEqualTo(accessInput.add);
- RevCommit updatedHead = getRemoteHead(p, "refs/meta/config");
- eventRecorder.assertRefUpdatedEvents(p.get(), "refs/meta/config",
+ RevCommit updatedHead = getRemoteHead(p, RefNames.REFS_CONFIG);
+ eventRecorder.assertRefUpdatedEvents(p.get(), RefNames.REFS_CONFIG,
null, initialHead,
initialHead, updatedHead);
}
@@ -377,7 +378,7 @@
// Load current permissions
String config = gApi.projects()
.name(allProjects.get())
- .branch("refs/meta/config").file("project.config").asString();
+ .branch(RefNames.REFS_CONFIG).file("project.config").asString();
// Append and push unknown permission
Config cfg = new Config();
@@ -387,12 +388,12 @@
PushOneCommit push = pushFactory.create(
db, admin.getIdent(), allProjectsRepo, "Subject", "project.config",
config);
- push.to("refs/meta/config").assertOkStatus();
+ push.to(RefNames.REFS_CONFIG).assertOkStatus();
// Verify that unknownPermission is present
config = gApi.projects()
.name(allProjects.get())
- .branch("refs/meta/config").file("project.config").asString();
+ .branch(RefNames.REFS_CONFIG).file("project.config").asString();
cfg.fromText(config);
assertThat(cfg.getString(access, refsFor, unknownPermission))
.isEqualTo(registeredUsers);
@@ -409,7 +410,7 @@
// Verify that unknownPermission is still present
config = gApi.projects()
.name(allProjects.get())
- .branch("refs/meta/config").file("project.config").asString();
+ .branch(RefNames.REFS_CONFIG).file("project.config").asString();
cfg.fromText(config);
assertThat(cfg.getString(access, refsFor, unknownPermission))
.isEqualTo(registeredUsers);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
index 856eefe..af1383b 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
@@ -26,6 +26,7 @@
import com.google.gerrit.extensions.api.projects.DeleteBranchesInput;
import com.google.gerrit.extensions.api.projects.ProjectApi;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
+import com.google.gerrit.reviewdb.client.RefNames;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Before;
@@ -142,7 +143,7 @@
private void assertBranches(List<String> branches) throws Exception {
List<String> expected = Lists.newArrayList(
- "HEAD", "refs/meta/config", "refs/heads/master");
+ "HEAD", RefNames.REFS_CONFIG, "refs/heads/master");
expected.addAll(branches);
assertRefNames(expected, project().branches().get());
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
index a3a107d..7c98188 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
@@ -24,6 +24,7 @@
import com.google.gerrit.extensions.api.projects.BranchInfo;
import com.google.gerrit.extensions.api.projects.ProjectApi.ListRefsRequest;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
+import com.google.gerrit.reviewdb.client.RefNames;
import org.junit.Test;
@@ -48,7 +49,7 @@
public void listBranchesOfEmptyProject() throws Exception {
assertBranches(ImmutableList.of(
branch("HEAD", null, false),
- branch("refs/meta/config", null, false)),
+ branch(RefNames.REFS_CONFIG, null, false)),
list().get());
}
@@ -58,7 +59,7 @@
String dev = pushTo("refs/heads/dev").getCommit().name();
assertBranches(ImmutableList.of(
branch("HEAD", "master", false),
- branch("refs/meta/config", null, false),
+ branch(RefNames.REFS_CONFIG, null, false),
branch("refs/heads/dev", dev, true),
branch("refs/heads/master", master, false)),
list().get());
@@ -98,7 +99,7 @@
// Using only limit.
assertRefNames(ImmutableList.of(
"HEAD",
- "refs/meta/config",
+ RefNames.REFS_CONFIG,
"refs/heads/master",
"refs/heads/someBranch1"),
list().withLimit(4).get());
@@ -106,7 +107,7 @@
// Limit higher than total number of branches.
assertRefNames(ImmutableList.of(
"HEAD",
- "refs/meta/config",
+ RefNames.REFS_CONFIG,
"refs/heads/master",
"refs/heads/someBranch1",
"refs/heads/someBranch2",
diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
index 40d8b53..31e9630 100644
--- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
+++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
@@ -27,7 +27,7 @@
@Test
public void fullName() throws Exception {
- assertThat(RefNames.fullName("refs/meta/config")).isEqualTo("refs/meta/config");
+ assertThat(RefNames.fullName(RefNames.REFS_CONFIG)).isEqualTo(RefNames.REFS_CONFIG);
assertThat(RefNames.fullName("refs/heads/master")).isEqualTo("refs/heads/master");
assertThat(RefNames.fullName("master")).isEqualTo("refs/heads/master");
assertThat(RefNames.fullName("refs/tags/v1.0")).isEqualTo("refs/tags/v1.0");
