Add constants for Code-Review and Verified labels
Migrate existing usages of "Code-Review" and "Verified" to use the
constants.
Change-Id: I5516cc3ffb46a35afc8ff3e7e080d26c1f91f689
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index ecfdd8b..f7ad56f 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -95,6 +95,7 @@
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Permission;
@@ -617,7 +618,7 @@
ReviewInput in =
ReviewInput.approve()
.reviewer(user.email())
- .label("Code-Review", 1)
+ .label(LabelId.CODE_REVIEW, 1)
.setWorkInProgress(true);
gApi.changes().id(r.getChangeId()).current().review(in);
@@ -625,7 +626,8 @@
assertThat(info.workInProgress).isTrue();
assertThat(info.reviewers.get(REVIEWER).stream().map(ai -> ai._accountId).collect(toList()))
.containsExactly(admin.id().get(), user.id().get());
- assertThat(info.labels.get("Code-Review").recommended._accountId).isEqualTo(admin.id().get());
+ assertThat(info.labels.get(LabelId.CODE_REVIEW).recommended._accountId)
+ .isEqualTo(admin.id().get());
}
@Test
@@ -780,7 +782,7 @@
assertThat(description).isEqualTo("Rebase");
// ...and the approval was copied
- LabelInfo cr = c2.labels.get("Code-Review");
+ LabelInfo cr = c2.labels.get(LabelId.CODE_REVIEW);
assertThat(cr).isNotNull();
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).value).isEqualTo(1);
@@ -2292,7 +2294,7 @@
gApi.changes().id(r.getChangeId()).reviewer(admin.id().toString()).votes();
assertThat(m).hasSize(1);
- assertThat(m).containsExactly("Code-Review", Short.valueOf((short) 2));
+ assertThat(m).containsExactly(LabelId.CODE_REVIEW, Short.valueOf((short) 2));
requestScopeOperations.setApiUser(user.id());
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).review(ReviewInput.dislike());
@@ -2300,7 +2302,7 @@
m = gApi.changes().id(r.getChangeId()).reviewer(user.id().toString()).votes();
assertThat(m).hasSize(1);
- assertThat(m).containsExactly("Code-Review", Short.valueOf((short) -1));
+ assertThat(m).containsExactly(LabelId.CODE_REVIEW, Short.valueOf((short) -1));
}
@Test
@@ -2314,18 +2316,18 @@
// check finding by address works
Map<String, Short> m = gApi.changes().id(r.getChangeId()).reviewer(admin.email()).votes();
assertThat(m).hasSize(1);
- assertThat(m).containsEntry("Code-Review", Short.valueOf((short) 2));
+ assertThat(m).containsEntry(LabelId.CODE_REVIEW, Short.valueOf((short) 2));
// check finding by id works
m = gApi.changes().id(r.getChangeId()).reviewer(admin.id().toString()).votes();
assertThat(m).hasSize(1);
- assertThat(m).containsEntry("Code-Review", Short.valueOf((short) 2));
+ assertThat(m).containsEntry(LabelId.CODE_REVIEW, Short.valueOf((short) 2));
}
@Test
public void removeReviewerNoVotes() throws Exception {
LabelType verified =
- label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+ label(LabelId.VERIFIED, value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig().upsertLabelType(verified);
u.save();
@@ -2531,7 +2533,10 @@
requestScopeOperations.setApiUser(admin.id());
sender.clear();
- gApi.changes().id(r.getChangeId()).reviewer(user.id().toString()).deleteVote("Code-Review");
+ gApi.changes()
+ .id(r.getChangeId())
+ .reviewer(user.id().toString())
+ .deleteVote(LabelId.CODE_REVIEW);
List<Message> messages = sender.getMessages();
assertThat(messages).hasSize(1);
@@ -2545,7 +2550,7 @@
gApi.changes().id(r.getChangeId()).reviewer(user.id().toString()).votes();
// Dummy 0 approval on the change to block vote copying to this patch set.
- assertThat(m).containsExactly("Code-Review", Short.valueOf((short) 0));
+ assertThat(m).containsExactly(LabelId.CODE_REVIEW, Short.valueOf((short) 0));
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
@@ -2567,7 +2572,7 @@
requestScopeOperations.setApiUser(admin.id());
sender.clear();
DeleteVoteInput in = new DeleteVoteInput();
- in.label = "Code-Review";
+ in.label = LabelId.CODE_REVIEW;
in.notify = NotifyHandling.NONE;
gApi.changes().id(r.getChangeId()).reviewer(user.id().toString()).deleteVote(in);
assertThat(sender.getMessages()).isEmpty();
@@ -2579,7 +2584,7 @@
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).review(ReviewInput.approve());
DeleteVoteInput in = new DeleteVoteInput();
- in.label = "Code-Review";
+ in.label = LabelId.CODE_REVIEW;
in.notify = NotifyHandling.NONE;
// notify unrelated account as TO
@@ -2633,14 +2638,14 @@
gApi.changes()
.id(r.getChangeId())
.reviewer(admin.id().toString())
- .deleteVote("Code-Review"));
+ .deleteVote(LabelId.CODE_REVIEW));
assertThat(thrown).hasMessageThat().contains("delete vote not permitted");
}
@Test
public void nonVotingReviewerStaysAfterSubmit() throws Exception {
LabelType verified =
- label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+ label(LabelId.VERIFIED, value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
String heads = "refs/heads/*";
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig().upsertLabelType(verified);
@@ -2650,7 +2655,7 @@
.project(project)
.forUpdate()
.add(allowLabel(verified.getName()).ref(heads).group(CHANGE_OWNER).range(-1, 1))
- .add(allowLabel("Code-Review").ref(heads).group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref(heads).group(REGISTERED_USERS).range(-2, +2))
.update();
// Set Code-Review+2 and Verified+1 as admin (change owner)
@@ -2799,7 +2804,7 @@
.withOptions(
ALL_REVISIONS, CHANGE_ACTIONS, CURRENT_ACTIONS, DETAILED_LABELS, MESSAGES)
.get());
- assertThat(Iterables.getOnlyElement(result.labels.keySet())).isEqualTo("Code-Review");
+ assertThat(Iterables.getOnlyElement(result.labels.keySet())).isEqualTo(LabelId.CODE_REVIEW);
assertThat(result.messages).hasSize(1);
assertThat(result.actions).isNotEmpty();
@@ -2982,7 +2987,7 @@
@Test
public void commitFooters() throws Exception {
LabelType verified =
- label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+ label(LabelId.VERIFIED, value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
LabelType custom1 =
label("Custom1", value(1, "Positive"), value(0, "No score"), value(-1, "Negative"));
LabelType custom2 =
@@ -3010,8 +3015,8 @@
r2.assertOkStatus();
ReviewInput in = new ReviewInput();
- in.label("Code-Review", 1);
- in.label("Verified", 1);
+ in.label(LabelId.CODE_REVIEW, 1);
+ in.label(LabelId.VERIFIED, 1);
in.label("Custom1", -1);
in.label("Custom2", 1);
gApi.changes().id(r2.getChangeId()).current().review(in);
@@ -3119,7 +3124,7 @@
String triplet = project.get() + "~master~" + r.getChangeId();
gApi.changes().id(triplet).addReviewer(user.username());
ChangeInfo c = gApi.changes().id(triplet).get(DETAILED_LABELS);
- LabelInfo codeReview = c.labels.get("Code-Review");
+ LabelInfo codeReview = c.labels.get(LabelId.CODE_REVIEW);
assertThat(codeReview.all).hasSize(1);
ApprovalInfo approval = codeReview.all.get(0);
assertThat(approval._accountId).isEqualTo(user.id().get());
@@ -3128,11 +3133,15 @@
projectOperations
.project(project)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-1, 1))
.update();
c = gApi.changes().id(triplet).get(DETAILED_LABELS);
- codeReview = c.labels.get("Code-Review");
+ codeReview = c.labels.get(LabelId.CODE_REVIEW);
assertThat(codeReview.all).hasSize(1);
approval = codeReview.all.get(0);
assertThat(approval._accountId).isEqualTo(user.id().get());
@@ -3323,8 +3332,8 @@
PushOneCommit.Result r = createChange();
ChangeInfo change = gApi.changes().id(r.getChangeId()).get();
assertThat(change.status).isEqualTo(ChangeStatus.NEW);
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review");
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertThat(change.permittedLabels.keySet()).containsExactly(LabelId.CODE_REVIEW);
// add new label and assert that it's returned for existing changes
AccountGroup.UUID registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID();
@@ -3342,10 +3351,11 @@
.update();
change = gApi.changes().id(r.getChangeId()).get();
- assertThat(change.labels.keySet()).containsExactly("Code-Review", "Verified");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review", "Verified");
- assertPermitted(change, "Code-Review", -2, -1, 0, 1, 2);
- assertPermitted(change, "Verified", -1, 0, 1);
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW, LabelId.VERIFIED);
+ assertThat(change.permittedLabels.keySet())
+ .containsExactly(LabelId.CODE_REVIEW, LabelId.VERIFIED);
+ assertPermitted(change, LabelId.CODE_REVIEW, -2, -1, 0, 1, 2);
+ assertPermitted(change, LabelId.VERIFIED, -1, 0, 1);
// add an approval on the new label
gApi.changes()
@@ -3369,15 +3379,15 @@
.update();
change = gApi.changes().id(r.getChangeId()).get();
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review");
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertThat(change.permittedLabels.keySet()).containsExactly(LabelId.CODE_REVIEW);
// abandon the change and see that the returned labels stay the same
// while all permitted labels disappear.
gApi.changes().id(r.getChangeId()).abandon();
change = gApi.changes().id(r.getChangeId()).get();
assertThat(change.status).isEqualTo(ChangeStatus.ABANDONED);
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
assertThat(change.permittedLabels).isEmpty();
}
@@ -3390,9 +3400,9 @@
ChangeInfo change = gApi.changes().id(r.getChangeId()).get();
assertThat(change.status).isEqualTo(ChangeStatus.MERGED);
assertThat(change.submissionId).isNotNull();
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review");
- assertPermitted(change, "Code-Review", 2);
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertThat(change.permittedLabels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertPermitted(change, LabelId.CODE_REVIEW, 2);
LabelType verified = TestLabels.verified();
AccountGroup.UUID registeredUsers = systemGroupBackend.getGroup(REGISTERED_USERS).getUUID();
@@ -3410,10 +3420,11 @@
.update();
change = gApi.changes().id(r.getChangeId()).get();
- assertThat(change.labels.keySet()).containsExactly("Code-Review", "Verified");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review", "Verified");
- assertPermitted(change, "Code-Review", 2);
- assertPermitted(change, "Verified", 0, 1);
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW, LabelId.VERIFIED);
+ assertThat(change.permittedLabels.keySet())
+ .containsExactly(LabelId.CODE_REVIEW, LabelId.VERIFIED);
+ assertPermitted(change, LabelId.CODE_REVIEW, 2);
+ assertPermitted(change, LabelId.VERIFIED, 0, 1);
// ignore the new label by Prolog submit rule and assert that the label is
// no longer returned
@@ -3429,8 +3440,8 @@
push2.to(RefNames.REFS_CONFIG);
change = gApi.changes().id(r.getChangeId()).get();
- assertPermitted(change, "Code-Review", 2);
- assertPermitted(change, "Verified");
+ assertPermitted(change, LabelId.CODE_REVIEW, 2);
+ assertPermitted(change, LabelId.VERIFIED);
// add an approval on the new label and assert that the label is now
// returned although it is ignored by the Prolog submit rule and hence not
@@ -3441,9 +3452,9 @@
.review(new ReviewInput().label(verified.getName(), verified.getMax().getValue()));
change = gApi.changes().id(r.getChangeId()).get();
- assertThat(change.labels.keySet()).containsExactly("Code-Review", "Verified");
- assertPermitted(change, "Code-Review", 2);
- assertPermitted(change, "Verified");
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW, LabelId.VERIFIED);
+ assertPermitted(change, LabelId.CODE_REVIEW, 2);
+ assertPermitted(change, LabelId.VERIFIED);
// remove label and assert that it's no longer returned for existing
// changes, even if there is an approval for it
@@ -3458,9 +3469,9 @@
.update();
change = gApi.changes().id(r.getChangeId()).get();
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review");
- assertPermitted(change, "Code-Review", 2);
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertThat(change.permittedLabels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertPermitted(change, LabelId.CODE_REVIEW, 2);
}
@Test
@@ -3553,9 +3564,10 @@
ChangeInfo change = gApi.changes().id(r.getChangeId()).get();
assertThat(change.status).isEqualTo(ChangeStatus.MERGED);
assertThat(change.submissionId).isNotNull();
- assertThat(change.labels.keySet()).containsExactly("Code-Review", "Non-Author-Code-Review");
- assertThat(change.permittedLabels.keySet()).containsExactly("Code-Review");
- assertPermitted(change, "Code-Review", 0, 1, 2);
+ assertThat(change.labels.keySet())
+ .containsExactly(LabelId.CODE_REVIEW, "Non-Author-Code-Review");
+ assertThat(change.permittedLabels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertPermitted(change, LabelId.CODE_REVIEW, 0, 1, 2);
}
@Test
@@ -3569,8 +3581,8 @@
ChangeInfo change = gApi.changes().id(r.getChangeId()).get();
assertThat(change.status).isEqualTo(ChangeStatus.MERGED);
assertThat(change.submissionId).isNotNull();
- assertThat(change.labels.keySet()).containsExactly("Code-Review");
- assertPermitted(change, "Code-Review", 0, 1, 2);
+ assertThat(change.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertPermitted(change, LabelId.CODE_REVIEW, 0, 1, 2);
}
@Test
@@ -3607,7 +3619,7 @@
gApi.changes().id(triplet).addReviewer(user.username());
ChangeInfo c = gApi.changes().id(triplet).get(DETAILED_LABELS);
- LabelInfo codeReview = c.labels.get("Code-Review");
+ LabelInfo codeReview = c.labels.get(LabelId.CODE_REVIEW);
assertThat(codeReview.all).hasSize(1);
ApprovalInfo approval = codeReview.all.get(0);
assertThat(approval._accountId).isEqualTo(user.id().get());
@@ -3620,14 +3632,14 @@
.project(project)
.forUpdate()
.add(
- allowLabel("Code-Review")
+ allowLabel(LabelId.CODE_REVIEW)
.ref(heads)
.group(REGISTERED_USERS)
.range(minPermittedValue, maxPermittedValue))
.update();
c = gApi.changes().id(triplet).get(DETAILED_LABELS);
- codeReview = c.labels.get("Code-Review");
+ codeReview = c.labels.get(LabelId.CODE_REVIEW);
assertThat(codeReview.all).hasSize(1);
approval = codeReview.all.get(0);
assertThat(approval._accountId).isEqualTo(user.id().get());
@@ -3641,7 +3653,11 @@
projectOperations
.project(project)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-1, 1))
.update();
PushOneCommit.Result r = createChange();
@@ -3650,7 +3666,7 @@
gApi.changes().id(triplet).addReviewer(user.username());
ChangeInfo c = gApi.changes().id(triplet).get(DETAILED_LABELS);
- LabelInfo codeReview = c.labels.get("Code-Review");
+ LabelInfo codeReview = c.labels.get(LabelId.CODE_REVIEW);
assertThat(codeReview.all).hasSize(1);
ApprovalInfo approval = codeReview.all.get(0);
assertThat(approval._accountId).isEqualTo(user.id().get());
@@ -3667,7 +3683,7 @@
Map<String, Short> votes =
gApi.changes().id(changeId).current().reviewer(admin.email()).votes();
- assertThat(votes.keySet()).containsExactly("Code-Review");
+ assertThat(votes.keySet()).containsExactly(LabelId.CODE_REVIEW);
assertThat(votes.values()).containsExactly((short) 2);
}
@@ -3676,7 +3692,7 @@
String changeId = createChange().getChangeId();
// Add a review with invalid label values.
- ReviewInput input = new ReviewInput().label("Code-Review", 3);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 3);
gApi.changes().id(changeId).current().review(input);
assertThrows(
@@ -3700,7 +3716,7 @@
@GerritConfig(name = "change.strictLabels", value = "true")
public void strictLabelWithInvalidValue() throws Exception {
String changeId = createChange().getChangeId();
- ReviewInput in = new ReviewInput().label("Code-Review", 3);
+ ReviewInput in = new ReviewInput().label(LabelId.CODE_REVIEW, 3);
BadRequestException thrown =
assertThrows(
@@ -3934,7 +3950,7 @@
}
private void submittableAfterLosingPermissions(String label) throws Exception {
- String codeReviewLabel = "Code-Review";
+ String codeReviewLabel = LabelId.CODE_REVIEW;
AccountGroup.UUID registered = REGISTERED_USERS;
projectOperations
.project(project)
diff --git a/javatests/com/google/gerrit/acceptance/api/change/PostReviewIT.java b/javatests/com/google/gerrit/acceptance/api/change/PostReviewIT.java
index 029d5a2..036e531 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/PostReviewIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/PostReviewIT.java
@@ -38,6 +38,7 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.api.changes.DraftInput;
@@ -459,7 +460,7 @@
// User adds themselves and changes state
requestScopeOperations.setApiUser(user.id());
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
gApi.changes().id(r.getChangeId()).current().review(input);
Map<ReviewerState, Collection<AccountInfo>> reviewers =
@@ -493,7 +494,7 @@
String testMessage = "hello from plugin";
TestOnPostReview testOnPostReview = new TestOnPostReview(testMessage);
try (Registration registration = extensionRegistry.newRegistration().add(testOnPostReview)) {
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
gApi.changes().id(r.getChangeId()).current().review(input);
Collection<ChangeMessageInfo> messages = gApi.changes().id(r.getChangeId()).get().messages;
assertThat(Iterables.getLast(messages).message)
@@ -511,7 +512,7 @@
TestOnPostReview testOnPostReview2 = new TestOnPostReview(testMessage2);
try (Registration registration =
extensionRegistry.newRegistration().add(testOnPostReview1).add(testOnPostReview2)) {
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
gApi.changes().id(r.getChangeId()).current().review(input);
Collection<ChangeMessageInfo> messages = gApi.changes().id(r.getChangeId()).get().messages;
assertThat(Iterables.getLast(messages).message)
@@ -527,7 +528,7 @@
TestOnPostReview testOnPostReview = new TestOnPostReview(/* message= */ null);
try (Registration registration = extensionRegistry.newRegistration().add(testOnPostReview)) {
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
gApi.changes().id(r.getChangeId()).current().review(input);
Collection<ChangeMessageInfo> messages = gApi.changes().id(r.getChangeId()).get().messages;
assertThat(Iterables.getLast(messages).message).isEqualTo("Patch Set 1: Code-Review+1");
@@ -541,7 +542,7 @@
TestOnPostReview testOnPostReview = new TestOnPostReview(/* message= */ null);
try (Registration registration = extensionRegistry.newRegistration().add(testOnPostReview)) {
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
// Vote on current patch set.
gApi.changes().id(r.getChangeId()).current().review(input);
@@ -559,7 +560,7 @@
TestOnPostReview testOnPostReview = new TestOnPostReview(/* message= */ null);
try (Registration registration = extensionRegistry.newRegistration().add(testOnPostReview)) {
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
// Vote from admin.
gApi.changes().id(r.getChangeId()).current().review(input);
@@ -579,28 +580,28 @@
TestOnPostReview testOnPostReview = new TestOnPostReview(/* message= */ null);
try (Registration registration = extensionRegistry.newRegistration().add(testOnPostReview)) {
// Add a new vote.
- ReviewInput input = new ReviewInput().label("Code-Review", 1);
+ ReviewInput input = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
gApi.changes().id(r.getChangeId()).current().review(input);
testOnPostReview.assertApproval(
- "Code-Review", /* expectedOldValue= */ 0, /* expectedNewValue= */ 1);
+ LabelId.CODE_REVIEW, /* expectedOldValue= */ 0, /* expectedNewValue= */ 1);
// Update an existing vote.
- input = new ReviewInput().label("Code-Review", 2);
+ input = new ReviewInput().label(LabelId.CODE_REVIEW, 2);
gApi.changes().id(r.getChangeId()).current().review(input);
testOnPostReview.assertApproval(
- "Code-Review", /* expectedOldValue= */ 1, /* expectedNewValue= */ 2);
+ LabelId.CODE_REVIEW, /* expectedOldValue= */ 1, /* expectedNewValue= */ 2);
// Post without changing the vote.
- input = new ReviewInput().label("Code-Review", 2);
+ input = new ReviewInput().label(LabelId.CODE_REVIEW, 2);
gApi.changes().id(r.getChangeId()).current().review(input);
testOnPostReview.assertApproval(
- "Code-Review", /* expectedOldValue= */ null, /* expectedNewValue= */ 2);
+ LabelId.CODE_REVIEW, /* expectedOldValue= */ null, /* expectedNewValue= */ 2);
// Delete the vote.
- input = new ReviewInput().label("Code-Review", 0);
+ input = new ReviewInput().label(LabelId.CODE_REVIEW, 0);
gApi.changes().id(r.getChangeId()).current().review(input);
testOnPostReview.assertApproval(
- "Code-Review", /* expectedOldValue= */ 2, /* expectedNewValue= */ 0);
+ LabelId.CODE_REVIEW, /* expectedOldValue= */ 2, /* expectedNewValue= */ 0);
}
}
diff --git a/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java b/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java
index 29b2788..1e7271a 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java
@@ -41,6 +41,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.api.changes.CherryPickInput;
@@ -83,7 +84,7 @@
// This way changes to the "Code Review" label don't affect other tests.
LabelType.Builder codeReview =
labelBuilder(
- "Code-Review",
+ LabelId.CODE_REVIEW,
value(2, "Looks good to me, approved"),
value(1, "Looks good to me, but someone else must approve"),
value(0, "No score"),
@@ -93,7 +94,8 @@
u.getConfig().upsertLabelType(codeReview.build());
LabelType.Builder verified =
- labelBuilder("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+ labelBuilder(
+ LabelId.VERIFIED, value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
verified.setCopyAllScoresIfNoChange(false);
u.getConfig().upsertLabelType(verified.build());
@@ -124,7 +126,7 @@
@Test
public void stickyOnAnyScore() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyAnyScore(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyAnyScore(true));
u.save();
}
@@ -146,7 +148,7 @@
@Test
public void stickyOnMinScore() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMinScore(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMinScore(true));
u.save();
}
@@ -168,7 +170,7 @@
@Test
public void stickyOnMaxScore() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMaxScore(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMaxScore(true));
u.save();
}
@@ -194,7 +196,7 @@
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
.updateLabelType(
- "Code-Review", b -> b.setCopyValues(ImmutableList.of((short) -1, (short) 1)));
+ LabelId.CODE_REVIEW, b -> b.setCopyValues(ImmutableList.of((short) -1, (short) 1)));
u.save();
}
@@ -218,7 +220,8 @@
@Test
public void stickyOnTrivialRebase() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyAllScoresOnTrivialRebase(true));
+ u.getConfig()
+ .updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyAllScoresOnTrivialRebase(true));
u.save();
}
@@ -264,7 +267,7 @@
@Test
public void stickyOnNoCodeChange() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Verified", b -> b.setCopyAllScoresIfNoCodeChange(true));
+ u.getConfig().updateLabelType(LabelId.VERIFIED, b -> b.setCopyAllScoresIfNoCodeChange(true));
u.save();
}
@@ -289,7 +292,8 @@
public void stickyOnMergeFirstParentUpdate() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
- .updateLabelType("Code-Review", b -> b.setCopyAllScoresOnMergeFirstParentUpdate(true));
+ .updateLabelType(
+ LabelId.CODE_REVIEW, b -> b.setCopyAllScoresOnMergeFirstParentUpdate(true));
u.save();
}
@@ -313,7 +317,7 @@
@Test
public void notStickyWithCopyOnNoChangeWhenSecondParentIsUpdated() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyAllScoresIfNoChange(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyAllScoresIfNoChange(true));
u.save();
}
@@ -332,7 +336,8 @@
throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
- .updateLabelType("Code-Review", b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
+ .updateLabelType(
+ LabelId.CODE_REVIEW, b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
u.save();
}
Change.Id changeId =
@@ -358,7 +363,8 @@
throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
- .updateLabelType("Code-Review", b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
+ .updateLabelType(
+ LabelId.CODE_REVIEW, b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
u.save();
}
Change.Id changeId =
@@ -379,7 +385,8 @@
throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
- .updateLabelType("Code-Review", b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
+ .updateLabelType(
+ LabelId.CODE_REVIEW, b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
u.save();
}
Change.Id changeId =
@@ -400,7 +407,8 @@
public void stickyWithCopyAllScoresIfListOfFilesDidNotChangeWhenFileIsRenamed() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig()
- .updateLabelType("Code-Review", b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
+ .updateLabelType(
+ LabelId.CODE_REVIEW, b -> b.setCopyAllScoresIfListOfFilesDidNotChange(true));
u.save();
}
Change.Id changeId =
@@ -420,8 +428,9 @@
@Test
public void removedVotesNotSticky() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyAllScoresOnTrivialRebase(true));
- u.getConfig().updateLabelType("Verified", b -> b.setCopyAllScoresIfNoCodeChange(true));
+ u.getConfig()
+ .updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyAllScoresOnTrivialRebase(true));
+ u.getConfig().updateLabelType(LabelId.VERIFIED, b -> b.setCopyAllScoresIfNoCodeChange(true));
u.save();
}
@@ -450,8 +459,8 @@
@Test
public void stickyAcrossMultiplePatchSets() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMaxScore(true));
- u.getConfig().updateLabelType("Verified", b -> b.setCopyAllScoresIfNoCodeChange(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMaxScore(true));
+ u.getConfig().updateLabelType(LabelId.VERIFIED, b -> b.setCopyAllScoresIfNoCodeChange(true));
u.save();
}
@@ -476,8 +485,8 @@
// change kind against all prior patch sets. This is a regression that made Gerrit do expensive
// work in O(num-patch-sets). This test ensures that we aren't regressing.
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMaxScore(true));
- u.getConfig().updateLabelType("Verified", b -> b.setCopyAllScoresIfNoCodeChange(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMaxScore(true));
+ u.getConfig().updateLabelType(LabelId.VERIFIED, b -> b.setCopyAllScoresIfNoCodeChange(true));
u.save();
}
@@ -508,8 +517,8 @@
@Test
public void copyMinMaxAcrossMultiplePatchSets() throws Exception {
try (ProjectConfigUpdate u = updateProject(project)) {
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMaxScore(true));
- u.getConfig().updateLabelType("Code-Review", b -> b.setCopyMinScore(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMaxScore(true));
+ u.getConfig().updateLabelType(LabelId.CODE_REVIEW, b -> b.setCopyMinScore(true));
u.save();
}
@@ -547,7 +556,7 @@
@Test
public void deleteStickyVote() throws Exception {
- String label = "Code-Review";
+ String label = LabelId.CODE_REVIEW;
try (ProjectConfigUpdate u = updateProject(project)) {
u.getConfig().updateLabelType(label, b -> b.setCopyMaxScore(true));
u.save();
@@ -561,7 +570,7 @@
assertVotes(detailedChange(changeId), admin, label, 2, REWORK);
// Delete vote that was copied via sticky approval
- deleteVote(admin, changeId, "Code-Review");
+ deleteVote(admin, changeId, label);
assertVotes(detailedChange(changeId), admin, label, 0, REWORK);
}
@@ -685,7 +694,7 @@
PushOneCommit.Result r = push.to("refs/for/master");
r.assertOkStatus();
RevisionApi revision = gApi.changes().id(r.getChangeId()).current();
- ReviewInput in = new ReviewInput().label("Code-Review", 2).label("Verified", 1);
+ ReviewInput in = new ReviewInput().label(LabelId.CODE_REVIEW, 2).label(LabelId.VERIFIED, 1);
revision.review(in);
revision.submit();
@@ -797,7 +806,9 @@
throws Exception {
requestScopeOperations.setApiUser(user.id());
ReviewInput in =
- new ReviewInput().label("Code-Review", codeReviewVote).label("Verified", verifiedVote);
+ new ReviewInput()
+ .label(LabelId.CODE_REVIEW, codeReviewVote)
+ .label(LabelId.VERIFIED, verifiedVote);
gApi.changes().id(changeId).current().review(in);
}
@@ -812,8 +823,8 @@
private void assertVotes(
ChangeInfo c, TestAccount user, int codeReviewVote, int verifiedVote, ChangeKind changeKind) {
- assertVotes(c, user, "Code-Review", codeReviewVote, changeKind);
- assertVotes(c, user, "Verified", verifiedVote, changeKind);
+ assertVotes(c, user, LabelId.CODE_REVIEW, codeReviewVote, changeKind);
+ assertVotes(c, user, LabelId.VERIFIED, verifiedVote, changeKind);
}
private void assertVotes(
diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
index 50ebef9..fcd6b76 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java
@@ -60,6 +60,7 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
@@ -1550,7 +1551,7 @@
.project(project)
.forUpdate()
.add(
- allowLabel("Code-Review")
+ allowLabel(LabelId.CODE_REVIEW)
.ref(RefNames.REFS_GROUPS + "*")
.group(REGISTERED_USERS)
.range(-2, 2))
diff --git a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
index d5fc1c1..6e19ac2 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
@@ -43,6 +43,7 @@
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
@@ -882,7 +883,7 @@
cfg.fromText(projectOperations.project(allProjects).getConfig().toText());
cfg.setStringList(
"label",
- "Code-Review",
+ LabelId.CODE_REVIEW,
"value",
ImmutableList.of("+1 LGTM", "1 LGTM", "0 No Value", "-1 Looks Bad"));
@@ -909,7 +910,7 @@
cfg ->
cfg.setStringList(
"label",
- "Code-Review",
+ LabelId.CODE_REVIEW,
"value",
ImmutableList.of("+1 LGTM", "1 LGTM", "0 No Value", "-1 Looks Bad")))
.invalidate();
@@ -917,8 +918,8 @@
// Verify that project info can be retrieved and that the label value "+1 LGTM" appears only
// once.
ProjectInfo projectInfo = gApi.projects().name(allProjects.get()).get();
- assertThat(projectInfo.labels.keySet()).containsExactly("Code-Review");
- assertThat(projectInfo.labels.get("Code-Review").values)
+ assertThat(projectInfo.labels.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ assertThat(projectInfo.labels.get(LabelId.CODE_REVIEW).values)
.containsExactly("+1", "LGTM", " 0", "No Value", "-1", "Looks Bad");
}
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index 8e31e904..6c53269 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -54,6 +54,7 @@
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.BranchOrderSection;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
@@ -165,7 +166,7 @@
String changeId = project.get() + "~master~" + r.getChangeId();
gApi.changes().id(changeId).current().review(ReviewInput.recommend());
- String label = "Code-Review";
+ String label = LabelId.CODE_REVIEW;
ApprovalInfo approval = getApproval(changeId, label);
assertThat(approval.value).isEqualTo(1);
assertThat(approval.postSubmit).isNull();
@@ -177,7 +178,7 @@
approval = getApproval(changeId, label);
assertThat(approval.value).isEqualTo(1);
assertThat(approval.postSubmit).isNull();
- assertPermitted(gApi.changes().id(changeId).get(DETAILED_LABELS), "Code-Review", 1, 2);
+ assertPermitted(gApi.changes().id(changeId).get(DETAILED_LABELS), LabelId.CODE_REVIEW, 1, 2);
// Repeating the current label is allowed. Does not flip the postSubmit bit
// due to deduplication codepath.
@@ -203,7 +204,7 @@
approval = getApproval(changeId, label);
assertThat(approval.value).isEqualTo(2);
assertThat(approval.postSubmit).isTrue();
- assertPermitted(gApi.changes().id(changeId).get(DETAILED_LABELS), "Code-Review", 2);
+ assertPermitted(gApi.changes().id(changeId).get(DETAILED_LABELS), LabelId.CODE_REVIEW, 2);
// Decreasing to previous post-submit vote is still not allowed.
thrown =
@@ -230,9 +231,9 @@
revision(r).review(ReviewInput.recommend());
requestScopeOperations.setApiUser(admin.id());
- gApi.changes().id(changeId).reviewer(user.username()).deleteVote("Code-Review");
+ gApi.changes().id(changeId).reviewer(user.username()).deleteVote(LabelId.CODE_REVIEW);
Optional<ApprovalInfo> crUser =
- get(changeId, DETAILED_LABELS).labels.get("Code-Review").all.stream()
+ get(changeId, DETAILED_LABELS).labels.get(LabelId.CODE_REVIEW).all.stream()
.filter(a -> a._accountId == user.id().get())
.findFirst();
assertThat(crUser).isPresent();
@@ -242,12 +243,13 @@
requestScopeOperations.setApiUser(user.id());
ReviewInput in = new ReviewInput();
- in.label("Code-Review", 1);
+ in.label(LabelId.CODE_REVIEW, 1);
in.message = "Still LGTM";
revision(r).review(in);
ApprovalInfo cr =
- gApi.changes().id(changeId).get(DETAILED_LABELS).labels.get("Code-Review").all.stream()
+ gApi.changes().id(changeId).get(DETAILED_LABELS).labels.get(LabelId.CODE_REVIEW).all
+ .stream()
.filter(a -> a._accountId == user.id().get())
.findFirst()
.get();
@@ -262,7 +264,7 @@
revision(r).submit();
ReviewInput in = new ReviewInput();
- in.label("Code-Review", 0);
+ in.label(LabelId.CODE_REVIEW, 0);
ResourceConflictException thrown =
assertThrows(ResourceConflictException.class, () -> revision(r).review(in));
@@ -285,7 +287,7 @@
Iterators.getOnlyElement(
cd.currentApprovals().stream().filter(a -> !a.isLegacySubmit()).iterator());
assertThat(psa.patchSetId().get()).isEqualTo(2);
- assertThat(psa.label()).isEqualTo("Code-Review");
+ assertThat(psa.label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psa.value()).isEqualTo(2);
assertThat(psa.postSubmit()).isFalse();
}
@@ -1865,7 +1867,7 @@
.id(r.getChangeId())
.revision(r.getCommit().getName())
.reviewer(user.id().toString())
- .deleteVote("Code-Review"));
+ .deleteVote(LabelId.CODE_REVIEW));
assertThat(thrown).hasMessageThat().contains("Cannot access on non-current patch set");
}
@@ -1886,12 +1888,12 @@
.id(r.getChangeId())
.current()
.reviewer(user.id().toString())
- .deleteVote("Code-Review");
+ .deleteVote(LabelId.CODE_REVIEW);
Map<String, Short> m =
gApi.changes().id(r.getChangeId()).current().reviewer(user.id().toString()).votes();
- assertThat(m).containsExactly("Code-Review", Short.valueOf((short) 0));
+ assertThat(m).containsExactly(LabelId.CODE_REVIEW, Short.valueOf((short) 0));
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
ChangeMessageInfo message = Iterables.getLast(c.messages);
@@ -1909,8 +1911,8 @@
assertThat(votes).isEmpty();
recommend(changeId);
votes = gApi.changes().id(changeId).current().votes();
- assertThat(votes.keySet()).containsExactly("Code-Review");
- List<ApprovalInfo> approvals = votes.get("Code-Review");
+ assertThat(votes.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ List<ApprovalInfo> approvals = votes.get(LabelId.CODE_REVIEW);
assertThat(approvals).hasSize(1);
ApprovalInfo approval = approvals.get(0);
assertThat(approval._accountId).isEqualTo(admin.id().get());
@@ -1924,8 +1926,8 @@
// Patch set 1 has 2 votes on Code-Review
requestScopeOperations.setApiUser(admin.id());
votes = gApi.changes().id(changeId).current().votes();
- assertThat(votes.keySet()).containsExactly("Code-Review");
- approvals = votes.get("Code-Review");
+ assertThat(votes.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ approvals = votes.get(LabelId.CODE_REVIEW);
assertThat(approvals).hasSize(2);
assertThat(approvals.stream().map(a -> a._accountId))
.containsExactlyElementsIn(ImmutableList.of(admin.id().get(), user.id().get()));
@@ -1937,8 +1939,8 @@
// Votes are still returned for ps 1
votes = gApi.changes().id(changeId).revision(1).votes();
- assertThat(votes.keySet()).containsExactly("Code-Review");
- approvals = votes.get("Code-Review");
+ assertThat(votes.keySet()).containsExactly(LabelId.CODE_REVIEW);
+ approvals = votes.get(LabelId.CODE_REVIEW);
assertThat(approvals).hasSize(2);
}
diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
index 5dbbe96..1e9c8eb 100644
--- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
+++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
@@ -40,6 +40,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.common.RawInputUtil;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.Patch;
import com.google.gerrit.entities.PatchSet;
@@ -769,7 +770,7 @@
@Test
public void editCommitMessageCopiesLabelScores() throws Exception {
- String cr = "Code-Review";
+ String cr = LabelId.CODE_REVIEW;
try (ProjectConfigUpdate u = updateProject(project)) {
LabelType codeReview = TestLabels.codeReview();
u.getConfig().upsertLabelType(codeReview);
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index a50bbcf..4139eeb 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -68,6 +68,7 @@
import com.google.gerrit.entities.BooleanProjectConfig;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.ChangeMessage;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.Permission;
@@ -1050,7 +1051,7 @@
PushOneCommit.Result r = pushTo("refs/for/master%l=Code-Review");
r.assertOkStatus();
ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS, MESSAGES, DETAILED_ACCOUNTS);
- LabelInfo cr = ci.labels.get("Code-Review");
+ LabelInfo cr = ci.labels.get(LabelId.CODE_REVIEW);
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).name).isEqualTo("Administrator");
assertThat(cr.all.get(0).value).isEqualTo(1);
@@ -1068,7 +1069,7 @@
r = push.to("refs/for/master%l=Code-Review+2");
ci = get(r.getChangeId(), DETAILED_LABELS, MESSAGES, DETAILED_ACCOUNTS);
- cr = ci.labels.get("Code-Review");
+ cr = ci.labels.get(LabelId.CODE_REVIEW);
assertThat(Iterables.getLast(ci.messages).message)
.isEqualTo("Uploaded patch set 2: Code-Review+2.");
// Check that the user who pushed the change was added as a reviewer since they added a vote
@@ -1107,7 +1108,7 @@
r = push.to("refs/for/master%l=Code-Review+2");
ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS, MESSAGES, DETAILED_ACCOUNTS);
- LabelInfo cr = ci.labels.get("Code-Review");
+ LabelInfo cr = ci.labels.get(LabelId.CODE_REVIEW);
assertThat(Iterables.getLast(ci.messages).message)
.isEqualTo("Uploaded patch set 2: Code-Review+2.");
diff --git a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
index 5c596dc..bf8de93 100644
--- a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
@@ -40,6 +40,7 @@
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.HumanComment;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.Patch;
import com.google.gerrit.entities.PatchSetApproval;
@@ -183,7 +184,7 @@
ReviewInput in = new ReviewInput();
in.onBehalfOf = user.id().toString();
- in.label("Verified", 1);
+ in.label(LabelId.VERIFIED, 1);
AuthException thrown = assertThrows(AuthException.class, () -> revision.review(in));
assertThat(thrown)
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index cbfbab6..bc61fae 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -59,6 +59,7 @@
import com.google.gerrit.entities.AttentionSetUpdate;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.entities.Permission;
@@ -415,7 +416,7 @@
.forUpdate()
.add(block(Permission.SUBMIT).ref("refs/*").group(CHANGE_OWNER))
.add(allow(Permission.SUBMIT).ref("refs/heads/*").group(REGISTERED_USERS))
- .add(allowLabel("Code-Review").ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
.update();
TestRepository<InMemoryRepository> repo = cloneProject(p, admin);
@@ -441,7 +442,7 @@
.forUpdate()
.add(block(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.add(allow(Permission.SUBMIT).ref("refs/*").group(CHANGE_OWNER))
- .add(allowLabel("Code-Review").ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
.update();
TestRepository<InMemoryRepository> repo = cloneProject(p, admin);
@@ -1489,7 +1490,7 @@
protected void assertApproved(String changeId, TestAccount user) throws Throwable {
ChangeInfo c = get(changeId, DETAILED_LABELS);
- LabelInfo cr = c.labels.get("Code-Review");
+ LabelInfo cr = c.labels.get(LabelId.CODE_REVIEW);
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).value).isEqualTo(2);
assertThat(Account.id(cr.all.get(0)._accountId)).isEqualTo(user.id());
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
index 264ced6..ad3a3c1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
@@ -37,6 +37,7 @@
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.extensions.api.changes.DeleteChangeMessageInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.common.ChangeInfo;
@@ -253,7 +254,7 @@
c.message = "comment 1";
c.path = FILE_NAME;
- ReviewInput reviewInput = new ReviewInput().label("Code-Review", 1);
+ ReviewInput reviewInput = new ReviewInput().label(LabelId.CODE_REVIEW, 1);
reviewInput.comments = ImmutableMap.of(c.path, Lists.newArrayList(c));
reviewInput.message = changeMessage;
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java
index 10194eb..6bffdf7 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java
@@ -27,6 +27,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -146,8 +147,8 @@
projectOperations
.project(project)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(groupUUID).range(-2, 2))
- .setExclusiveGroup(labelPermissionKey("Code-Review").ref("refs/heads/*"), exclusive)
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(groupUUID).range(-2, 2))
+ .setExclusiveGroup(labelPermissionKey(LabelId.CODE_REVIEW).ref("refs/heads/*"), exclusive)
.update();
}
@@ -156,7 +157,7 @@
.project(project)
.forUpdate()
.add(
- blockLabel("Code-Review")
+ blockLabel(LabelId.CODE_REVIEW)
.ref("refs/heads/*")
.group(SystemGroupBackend.CHANGE_OWNER)
.range(-2, 2))
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
index 50cfbe3..dc66c58 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
@@ -38,6 +38,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.Address;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.api.changes.AddReviewerInput;
@@ -284,7 +285,7 @@
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
assertReviewers(c, REVIEWER, user);
assertReviewers(c, CC);
- LabelInfo label = c.labels.get("Code-Review");
+ LabelInfo label = c.labels.get(LabelId.CODE_REVIEW);
assertThat(label).isNotNull();
assertThat(label.all).isNotNull();
assertThat(label.all).hasSize(1);
@@ -314,7 +315,7 @@
assertReviewers(c, CC, user);
// Verify no approvals were added.
assertThat(c.labels).isNotNull();
- LabelInfo label = c.labels.get("Code-Review");
+ LabelInfo label = c.labels.get(LabelId.CODE_REVIEW);
assertThat(label).isNotNull();
assertThat(label.all).isNull();
}
@@ -328,7 +329,7 @@
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
assertReviewers(c, REVIEWER);
assertReviewers(c, CC);
- LabelInfo label = c.labels.get("Code-Review");
+ LabelInfo label = c.labels.get(LabelId.CODE_REVIEW);
assertThat(label).isNotNull();
assertThat(label.all).isNull();
@@ -343,7 +344,7 @@
c = gApi.changes().id(r.getChangeId()).get();
assertReviewers(c, REVIEWER, user);
assertReviewers(c, CC);
- label = c.labels.get("Code-Review");
+ label = c.labels.get(LabelId.CODE_REVIEW);
assertThat(label).isNotNull();
assertThat(label.all).isNotNull();
assertThat(label.all).hasSize(1);
@@ -367,7 +368,7 @@
c = gApi.changes().id(r.getChangeId()).get();
assertReviewers(c, REVIEWER, user);
assertReviewers(c, CC);
- label = c.labels.get("Code-Review");
+ label = c.labels.get(LabelId.CODE_REVIEW);
assertThat(label).isNotNull();
assertThat(label.all).isNotNull();
assertThat(label.all).hasSize(1);
@@ -601,7 +602,7 @@
@Test
public void removingReviewerRemovesTheirVote() throws Exception {
- String crLabel = "Code-Review";
+ String crLabel = LabelId.CODE_REVIEW;
PushOneCommit.Result r = createChange();
ReviewInput input = ReviewInput.approve().reviewer(admin.email());
ReviewResult addResult = review(r.getChangeId(), r.getCommit().name(), input);
@@ -662,10 +663,16 @@
PushOneCommit.Result r = createChange();
requestScopeOperations.setApiUser(user.id());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 1));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 1));
requestScopeOperations.setApiUser(admin.id());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 2));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 2));
gApi.changes().id(r.getChangeId()).current().submit();
AuthException thrown =
@@ -680,10 +687,16 @@
PushOneCommit.Result r = createChange();
requestScopeOperations.setApiUser(user.id());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 1));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 1));
requestScopeOperations.setApiUser(admin.id());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 2));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 2));
gApi.changes().id(r.getChangeId()).current().submit();
requestScopeOperations.setApiUser(user.id());
@@ -700,7 +713,10 @@
PushOneCommit.Result r = createChange();
gApi.changes().id(r.getChangeId()).addReviewer(user.email());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 2));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 2));
gApi.changes().id(r.getChangeId()).current().submit();
gApi.changes().id(r.getChangeId()).reviewer(user.email()).remove();
@@ -719,7 +735,10 @@
PushOneCommit.Result r = createChange();
gApi.changes().id(r.getChangeId()).addReviewer(user.email());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 2));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 2));
gApi.changes().id(r.getChangeId()).current().submit();
requestScopeOperations.setApiUser(user.id());
@@ -740,7 +759,10 @@
TestAccount newUser = createAccounts(1, name("foo")).get(0);
requestScopeOperations.setApiUser(user.id());
- gApi.changes().id(r.getChangeId()).current().review(new ReviewInput().label("Code-Review", 1));
+ gApi.changes()
+ .id(r.getChangeId())
+ .current()
+ .review(new ReviewInput().label(LabelId.CODE_REVIEW, 1));
requestScopeOperations.setApiUser(newUser.id());
AuthException thrown =
assertThrows(
@@ -867,7 +889,11 @@
projectOperations
.project(project)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, 2))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, 2))
.update();
// Create a change and add 'user' as reviewer.
@@ -886,7 +912,7 @@
requestScopeOperations.setApiUser(user.id());
approve(changeId);
c = gApi.changes().id(changeId).get();
- assertThat(c.labels.get("Code-Review").approved._accountId).isEqualTo(user.id().get());
+ assertThat(c.labels.get(LabelId.CODE_REVIEW).approved._accountId).isEqualTo(user.id().get());
// Move 'user' from reviewer to CC.
requestScopeOperations.setApiUser(admin.id());
@@ -904,7 +930,7 @@
assertThat(c.reviewers.get(REVIEWER)).isNull();
// Verify that the approval of 'user' is still there.
- assertThat(c.labels.get("Code-Review").approved._accountId).isEqualTo(user.id().get());
+ assertThat(c.labels.get(LabelId.CODE_REVIEW).approved._accountId).isEqualTo(user.id().get());
}
private void assertThatUserIsOnlyReviewer(String changeId) throws Exception {
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
index 25e5647..0c2c3a1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/DeleteVoteIT.java
@@ -24,6 +24,7 @@
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
@@ -92,7 +93,7 @@
Map<String, Short> m =
newGson().fromJson(response.getReader(), new TypeToken<Map<String, Short>>() {}.getType());
- assertThat(m).containsExactly("Code-Review", Short.valueOf((short) 0));
+ assertThat(m).containsExactly(LabelId.CODE_REVIEW, Short.valueOf((short) 0));
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
index 19e36f2..e94b660 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
@@ -34,6 +34,7 @@
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.extensions.api.changes.MoveInput;
@@ -496,7 +497,7 @@
// vote holds the minimum value.
createBranch(BranchNameKey.create(project, "foo"));
- String codeReviewLabel = "Code-Review"; // 'Code-Review' uses 'MaxWithBlock' function.
+ String codeReviewLabel = LabelId.CODE_REVIEW; // 'Code-Review' uses 'MaxWithBlock' function.
String testLabelA = "Label-A";
String testLabelB = "Label-B";
String testLabelC = "Label-C";
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
index 995de0d..157c93c 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
@@ -29,6 +29,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.changes.ChangeApi;
@@ -571,7 +572,11 @@
projectOperations
.project(project)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, 2))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, 2))
.add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.update();
@@ -633,7 +638,11 @@
projectOperations
.project(project)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, 2))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, 2))
.add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.update();
@@ -690,13 +699,21 @@
projectOperations
.project(p1)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, 2))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, 2))
.add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.update();
projectOperations
.project(p2)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, 2))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, 2))
.add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.update();
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
index cf8efa7..ff4f203 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
@@ -34,6 +34,7 @@
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.entities.AccessSection;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
@@ -82,8 +83,6 @@
private static final String REFS_DRAFTS = "refs/draft-comments/*";
private static final String REFS_STARRED_CHANGES = "refs/starred-changes/*";
- private static final String LABEL_CODE_REVIEW = "Code-Review";
-
@Inject private ProjectOperations projectOperations;
@Inject private RequestScopeOperations requestScopeOperations;
@Inject private ExtensionRegistry extensionRegistry;
@@ -418,13 +417,13 @@
// Remove specific permission
AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
accessSectionToRemove.permissions.put(
- Permission.LABEL + LABEL_CODE_REVIEW, newPermissionInfo());
+ Permission.LABEL + LabelId.CODE_REVIEW, newPermissionInfo());
ProjectAccessInput removal = newProjectAccessInput();
removal.remove.put(REFS_HEADS, accessSectionToRemove);
pApi().access(removal);
// Remove locally
- accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LABEL_CODE_REVIEW);
+ accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
// Check
assertThat(pApi().access().local).isEqualTo(accessInput.add);
@@ -442,10 +441,10 @@
// Remove specific permission rule
AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LABEL_CODE_REVIEW;
+ codeReview.label = LabelId.CODE_REVIEW;
PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
- accessSectionToRemove.permissions.put(Permission.LABEL + LABEL_CODE_REVIEW, codeReview);
+ accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
ProjectAccessInput removal = newProjectAccessInput();
removal.remove.put(REFS_HEADS, accessSectionToRemove);
pApi().access(removal);
@@ -455,7 +454,7 @@
.add
.get(REFS_HEADS)
.permissions
- .get(Permission.LABEL + LABEL_CODE_REVIEW)
+ .get(Permission.LABEL + LabelId.CODE_REVIEW)
.rules
.remove(SystemGroupBackend.REGISTERED_USERS.get());
@@ -475,18 +474,18 @@
// Remove specific permission rules
AccessSectionInfo accessSectionToRemove = newAccessSectionInfo();
PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LABEL_CODE_REVIEW;
+ codeReview.label = LabelId.CODE_REVIEW;
PermissionRuleInfo pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
- accessSectionToRemove.permissions.put(Permission.LABEL + LABEL_CODE_REVIEW, codeReview);
+ accessSectionToRemove.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
ProjectAccessInput removal = newProjectAccessInput();
removal.remove.put(REFS_HEADS, accessSectionToRemove);
pApi().access(removal);
// Remove locally
- accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LABEL_CODE_REVIEW);
+ accessInput.add.get(REFS_HEADS).permissions.remove(Permission.LABEL + LabelId.CODE_REVIEW);
// Check
assertThat(pApi().access().local).isEqualTo(accessInput.add);
@@ -978,7 +977,7 @@
accessSection.permissions.put(Permission.PUSH, push);
PermissionInfo codeReview = newPermissionInfo();
- codeReview.label = LABEL_CODE_REVIEW;
+ codeReview.label = LabelId.CODE_REVIEW;
pri = new PermissionRuleInfo(PermissionRuleInfo.Action.DENY, false);
codeReview.rules.put(SystemGroupBackend.REGISTERED_USERS.get(), pri);
@@ -986,7 +985,7 @@
pri.max = 1;
pri.min = -1;
codeReview.rules.put(SystemGroupBackend.PROJECT_OWNERS.get(), pri);
- accessSection.permissions.put(Permission.LABEL + LABEL_CODE_REVIEW, codeReview);
+ accessSection.permissions.put(Permission.LABEL + LabelId.CODE_REVIEW, codeReview);
return accessSection;
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java
index d44aa0a..6a98b8b 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java
@@ -26,6 +26,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
@@ -95,7 +96,7 @@
() ->
gApi.projects()
.name(allProjects.get())
- .label("Code-Review")
+ .label(LabelId.CODE_REVIEW)
.create(new LabelDefinitionInput()));
assertThat(thrown).hasMessageThat().contains("label Code-Review already exists");
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java
index 57c7b17..c2db9f1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java
@@ -22,6 +22,7 @@
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -39,7 +40,7 @@
AuthException thrown =
assertThrows(
AuthException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").delete());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).delete());
assertThat(thrown).hasMessageThat().contains("Authentication required");
}
@@ -55,7 +56,7 @@
AuthException thrown =
assertThrows(
AuthException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").delete());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).delete());
assertThat(thrown).hasMessageThat().contains("write refs/meta/config not permitted");
}
@@ -70,18 +71,18 @@
@Test
public void delete() throws Exception {
- gApi.projects().name(allProjects.get()).label("Code-Review").delete();
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).delete();
ResourceNotFoundException thrown =
assertThrows(
ResourceNotFoundException.class,
- () -> gApi.projects().name(project.get()).label("Code-Review").get());
+ () -> gApi.projects().name(project.get()).label(LabelId.CODE_REVIEW).get());
assertThat(thrown).hasMessageThat().contains("Not found: Code-Review");
}
@Test
public void defaultCommitMessage() throws Exception {
- gApi.projects().name(allProjects.get()).label("Code-Review").delete();
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).delete();
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
.isEqualTo("Delete label");
@@ -89,7 +90,10 @@
@Test
public void withCommitMessage() throws Exception {
- gApi.projects().name(allProjects.get()).label("Code-Review").delete("Delete Code-Review label");
+ gApi.projects()
+ .name(allProjects.get())
+ .label(LabelId.CODE_REVIEW)
+ .delete("Delete Code-Review label");
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
.isEqualTo("Delete Code-Review label");
@@ -99,7 +103,7 @@
public void commitMessageIsTrimmed() throws Exception {
gApi.projects()
.name(allProjects.get())
- .label("Code-Review")
+ .label(LabelId.CODE_REVIEW)
.delete(" Delete Code-Review label ");
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java
index 787bd2e..302d827 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java
@@ -22,6 +22,7 @@
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
@@ -38,7 +39,7 @@
AuthException thrown =
assertThrows(
AuthException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").get());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get());
assertThat(thrown).hasMessageThat().contains("Authentication required");
}
@@ -48,7 +49,7 @@
AuthException thrown =
assertThrows(
AuthException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").get());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get());
assertThat(thrown).hasMessageThat().contains("read refs/meta/config not permitted");
}
@@ -64,7 +65,7 @@
@Test
public void allProjectsCodeReviewLabel() throws Exception {
LabelDefinitionInfo codeReviewLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").get();
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get();
LabelAssert.assertCodeReviewLabel(codeReviewLabel);
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java b/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java
index eabbac5..9e31026 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java
@@ -17,12 +17,13 @@
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
import com.google.gerrit.server.config.AllProjectsNameProvider;
public class LabelAssert {
public static void assertCodeReviewLabel(LabelDefinitionInfo codeReviewLabel) {
- assertThat(codeReviewLabel.name).isEqualTo("Code-Review");
+ assertThat(codeReviewLabel.name).isEqualTo(LabelId.CODE_REVIEW);
assertThat(codeReviewLabel.projectName).isEqualTo(AllProjectsNameProvider.DEFAULT);
assertThat(codeReviewLabel.function).isEqualTo(LabelFunction.MAX_WITH_BLOCK.getFunctionName());
assertThat(codeReviewLabel.values)
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java
index d73339f..a397693 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java
@@ -27,6 +27,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
@@ -65,7 +66,7 @@
@Test
public void allProjectsLabels() throws Exception {
List<LabelDefinitionInfo> labels = gApi.projects().name(allProjects.get()).labels().get();
- assertThat(labelNames(labels)).containsExactly("Code-Review");
+ assertThat(labelNames(labels)).containsExactly(LabelId.CODE_REVIEW);
LabelDefinitionInfo codeReviewLabel = Iterables.getOnlyElement(labels);
LabelAssert.assertCodeReviewLabel(codeReviewLabel);
@@ -213,7 +214,7 @@
public void inheritedLabelsOnly() throws Exception {
List<LabelDefinitionInfo> labels =
gApi.projects().name(project.get()).labels().withInherited(true).get();
- assertThat(labelNames(labels)).containsExactly("Code-Review");
+ assertThat(labelNames(labels)).containsExactly(LabelId.CODE_REVIEW);
LabelDefinitionInfo codeReviewLabel = Iterables.getOnlyElement(labels);
LabelAssert.assertCodeReviewLabel(codeReviewLabel);
@@ -227,7 +228,9 @@
List<LabelDefinitionInfo> labels =
gApi.projects().name(project.get()).labels().withInherited(true).get();
- assertThat(labelNames(labels)).containsExactly("Code-Review", "bar", "baz", "foo").inOrder();
+ assertThat(labelNames(labels))
+ .containsExactly(LabelId.CODE_REVIEW, "bar", "baz", "foo")
+ .inOrder();
LabelAssert.assertCodeReviewLabel(labels.get(0));
assertThat(labels.get(1).name).isEqualTo("bar");
@@ -240,14 +243,14 @@
@Test
public void withInheritedLabelsAndOverriddenLabel() throws Exception {
- configLabel("Code-Review", LabelFunction.NO_OP);
+ configLabel(LabelId.CODE_REVIEW, LabelFunction.NO_OP);
List<LabelDefinitionInfo> labels =
gApi.projects().name(project.get()).labels().withInherited(true).get();
- assertThat(labelNames(labels)).containsExactly("Code-Review", "Code-Review");
+ assertThat(labelNames(labels)).containsExactly(LabelId.CODE_REVIEW, LabelId.CODE_REVIEW);
LabelAssert.assertCodeReviewLabel(labels.get(0));
- assertThat(labels.get(1).name).isEqualTo("Code-Review");
+ assertThat(labels.get(1).name).isEqualTo(LabelId.CODE_REVIEW);
assertThat(labels.get(1).projectName).isEqualTo(project.get());
assertThat(labels.get(1).function).isEqualTo(LabelFunction.NO_OP.getFunctionName());
}
@@ -262,7 +265,7 @@
List<LabelDefinitionInfo> labels =
gApi.projects().name(childProject.get()).labels().withInherited(true).get();
- assertThat(labelNames(labels)).containsExactly("Code-Review", "foo", "bar").inOrder();
+ assertThat(labelNames(labels)).containsExactly(LabelId.CODE_REVIEW, "foo", "bar").inOrder();
LabelAssert.assertCodeReviewLabel(labels.get(0));
assertThat(labels.get(1).name).isEqualTo("foo");
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java
index ba52024..cbaba2e 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java
@@ -25,6 +25,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.common.BatchLabelInput;
@@ -124,7 +125,7 @@
@Test
public void cannotCreateLabelWithNameThatIsAlreadyInUse() throws Exception {
LabelDefinitionInput labelInput = new LabelDefinitionInput();
- labelInput.name = "Code-Review";
+ labelInput.name = LabelId.CODE_REVIEW;
BatchLabelInput input = new BatchLabelInput();
input.create = ImmutableList.of(labelInput);
@@ -319,7 +320,7 @@
labelInput.commitMessage = "Update label";
BatchLabelInput input = new BatchLabelInput();
- input.update = ImmutableMap.of("Code-Review", labelInput);
+ input.update = ImmutableMap.of(LabelId.CODE_REVIEW, labelInput);
BadRequestException thrown =
assertThrows(
@@ -425,7 +426,7 @@
@Test
public void defaultCommitMessage() throws Exception {
BatchLabelInput input = new BatchLabelInput();
- input.delete = ImmutableList.of("Code-Review");
+ input.delete = ImmutableList.of(LabelId.CODE_REVIEW);
gApi.projects().name(allProjects.get()).labels(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
@@ -436,7 +437,7 @@
public void withCommitMessage() throws Exception {
BatchLabelInput input = new BatchLabelInput();
input.commitMessage = "Batch Update Labels";
- input.delete = ImmutableList.of("Code-Review");
+ input.delete = ImmutableList.of(LabelId.CODE_REVIEW);
gApi.projects().name(allProjects.get()).labels(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
@@ -447,7 +448,7 @@
public void commitMessageIsTrimmed() throws Exception {
BatchLabelInput input = new BatchLabelInput();
input.commitMessage = " Batch Update Labels ";
- input.delete = ImmutableList.of("Code-Review");
+ input.delete = ImmutableList.of(LabelId.CODE_REVIEW);
gApi.projects().name(allProjects.get()).labels(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java
index 66b15a8..2e68b54 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java
@@ -26,6 +26,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.entities.LabelFunction;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.common.LabelDefinitionInfo;
@@ -52,7 +53,7 @@
() ->
gApi.projects()
.name(allProjects.get())
- .label("Code-Review")
+ .label(LabelId.CODE_REVIEW)
.update(new LabelDefinitionInput()));
assertThat(thrown).hasMessageThat().contains("Authentication required");
}
@@ -72,7 +73,7 @@
() ->
gApi.projects()
.name(allProjects.get())
- .label("Code-Review")
+ .label(LabelId.CODE_REVIEW)
.update(new LabelDefinitionInput()));
assertThat(thrown).hasMessageThat().contains("write refs/meta/config not permitted");
}
@@ -83,13 +84,13 @@
input.name = "Foo-Review";
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.name).isEqualTo(input.name);
assertThat(gApi.projects().name(allProjects.get()).label("Foo-Review").get()).isNotNull();
assertThrows(
ResourceNotFoundException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").get());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get());
}
@Test
@@ -98,13 +99,13 @@
input.name = " Foo-Review ";
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.name).isEqualTo("Foo-Review");
assertThat(gApi.projects().name(allProjects.get()).label("Foo-Review").get()).isNotNull();
assertThrows(
ResourceNotFoundException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").get());
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get());
}
@Test
@@ -115,7 +116,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("name cannot be empty");
}
@@ -127,7 +128,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("invalid name: " + input.name);
}
@@ -169,10 +170,10 @@
input.function = LabelFunction.NO_OP.getFunctionName();
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.function).isEqualTo(input.function);
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().function)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().function)
.isEqualTo(input.function);
}
@@ -182,10 +183,10 @@
input.function = " " + LabelFunction.NO_OP.getFunctionName() + " ";
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.function).isEqualTo(LabelFunction.NO_OP.getFunctionName());
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().function)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().function)
.isEqualTo(LabelFunction.NO_OP.getFunctionName());
}
@@ -197,7 +198,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("function cannot be empty");
}
@@ -209,7 +210,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("unknown function: " + input.function);
}
@@ -221,7 +222,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("values cannot be empty");
}
@@ -243,7 +244,7 @@
"Looks Very Bad");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.values)
.containsExactly(
"+2", "Looks Very Good",
@@ -252,7 +253,7 @@
"-1", "Looks Bad",
"-2", "Looks Very Bad");
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().values)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().values)
.containsExactly(
"+2", "Looks Very Good",
"+1", "Looks Good",
@@ -279,7 +280,7 @@
" Looks Very Bad ");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.values)
.containsExactly(
"+2", "Looks Very Good",
@@ -288,7 +289,7 @@
"-1", "Looks Bad",
"-2", "Looks Very Bad");
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().values)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().values)
.containsExactly(
"+2", "Looks Very Good",
"+1", "Looks Good",
@@ -305,7 +306,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("invalid value: invalidValue");
}
@@ -317,7 +318,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("description for value '+1' cannot be empty");
}
@@ -332,7 +333,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("duplicate value: 1");
}
@@ -342,10 +343,11 @@
input.defaultValue = 1;
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.defaultValue).isEqualTo(input.defaultValue);
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().defaultValue)
+ assertThat(
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().defaultValue)
.isEqualTo(input.defaultValue);
}
@@ -357,7 +359,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("invalid default value: " + input.defaultValue);
}
@@ -369,10 +371,10 @@
ImmutableList.of("refs/heads/master", "refs/heads/foo/*", "^refs/heads/stable-.*");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.branches).containsExactlyElementsIn(input.branches);
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.containsExactlyElementsIn(input.branches);
}
@@ -383,11 +385,11 @@
ImmutableList.of(" refs/heads/master ", " refs/heads/foo/* ", " ^refs/heads/stable-.* ");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.branches)
.containsExactly("refs/heads/master", "refs/heads/foo/*", "^refs/heads/stable-.*");
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.containsExactly("refs/heads/master", "refs/heads/foo/*", "^refs/heads/stable-.*");
}
@@ -397,10 +399,10 @@
input.branches = ImmutableList.of("refs/heads/master", "", " ");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.branches).containsExactly("refs/heads/master");
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.containsExactly("refs/heads/master");
}
@@ -408,15 +410,15 @@
public void branchesCanBeUnset() throws Exception {
LabelDefinitionInput input = new LabelDefinitionInput();
input.branches = ImmutableList.of("refs/heads/master");
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.isNotNull();
input.branches = ImmutableList.of();
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.branches).isNull();
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.isNull();
}
@@ -428,7 +430,7 @@
BadRequestException thrown =
assertThrows(
BadRequestException.class,
- () -> gApi.projects().name(allProjects.get()).label("Code-Review").update(input));
+ () -> gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input));
assertThat(thrown).hasMessageThat().contains("invalid branch: refs heads master");
}
@@ -438,10 +440,10 @@
input.branches = ImmutableList.of("master", "refs/meta/config");
LabelDefinitionInfo updatedLabel =
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(updatedLabel.branches).containsExactly("refs/heads/master", "refs/meta/config");
- assertThat(gApi.projects().name(allProjects.get()).label("Code-Review").get().branches)
+ assertThat(gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get().branches)
.containsExactly("refs/heads/master", "refs/meta/config");
}
@@ -925,12 +927,12 @@
LabelDefinitionInfo updatedLabel =
gApi.projects()
.name(allProjects.get())
- .label("Code-Review")
+ .label(LabelId.CODE_REVIEW)
.update(new LabelDefinitionInput());
LabelAssert.assertCodeReviewLabel(updatedLabel);
LabelAssert.assertCodeReviewLabel(
- gApi.projects().name(allProjects.get()).label("Code-Review").get());
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).get());
assertThat(projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG))
.isEqualTo(refsMetaConfigHead);
@@ -940,7 +942,7 @@
public void defaultCommitMessage() throws Exception {
LabelDefinitionInput input = new LabelDefinitionInput();
input.function = LabelFunction.NO_OP.getFunctionName();
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
.isEqualTo("Update label");
@@ -951,7 +953,7 @@
LabelDefinitionInput input = new LabelDefinitionInput();
input.function = LabelFunction.NO_OP.getFunctionName();
input.commitMessage = "Set NoOp function";
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
.isEqualTo(input.commitMessage);
@@ -962,7 +964,7 @@
LabelDefinitionInput input = new LabelDefinitionInput();
input.function = LabelFunction.NO_OP.getFunctionName();
input.commitMessage = " Set NoOp function ";
- gApi.projects().name(allProjects.get()).label("Code-Review").update(input);
+ gApi.projects().name(allProjects.get()).label(LabelId.CODE_REVIEW).update(input);
assertThat(
projectOperations.project(allProjects).getHead(RefNames.REFS_CONFIG).getShortMessage())
.isEqualTo("Set NoOp function");
diff --git a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
index b2a349e..f267513 100644
--- a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
@@ -37,6 +37,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.Permission;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.api.changes.AbandonInput;
@@ -89,7 +90,7 @@
.add(allow(Permission.FORGE_COMMITTER).ref("refs/*").group(REGISTERED_USERS))
.add(allow(Permission.SUBMIT).ref("refs/*").group(REGISTERED_USERS))
.add(allow(Permission.ABANDON).ref("refs/*").group(REGISTERED_USERS))
- .add(allowLabel("Code-Review").ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/*").group(REGISTERED_USERS).range(-2, +2))
.update();
}
@@ -1470,14 +1471,14 @@
private void deleteVote(StagedChange sc, TestAccount account) throws Exception {
sender.clear();
- gApi.changes().id(sc.changeId).reviewer(account.email()).deleteVote("Code-Review");
+ gApi.changes().id(sc.changeId).reviewer(account.email()).deleteVote(LabelId.CODE_REVIEW);
}
private void deleteVote(StagedChange sc, TestAccount account, NotifyHandling notify)
throws Exception {
sender.clear();
DeleteVoteInput in = new DeleteVoteInput();
- in.label = "Code-Review";
+ in.label = LabelId.CODE_REVIEW;
in.notify = notify;
gApi.changes().id(sc.changeId).reviewer(account.email()).deleteVote(in);
}
diff --git a/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java b/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java
index d3b40cc..f26f5f3 100644
--- a/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java
@@ -20,6 +20,7 @@
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.SubmitRecord;
import com.google.gerrit.entities.SubmitRequirement;
@@ -37,7 +38,7 @@
@Test
public void blocksWhenUploaderIsOnlyApprover() throws Exception {
- enableRule("Code-Review", true);
+ enableRule(LabelId.CODE_REVIEW, true);
PushOneCommit.Result r = createChange();
approve(r.getChangeId());
@@ -58,7 +59,7 @@
@Test
public void allowsSubmissionWhenChangeHasNonUploaderApproval() throws Exception {
- enableRule("Code-Review", true);
+ enableRule(LabelId.CODE_REVIEW, true);
// Create change as user
TestRepository<InMemoryRepository> userTestRepo = cloneProject(project, user);
@@ -74,7 +75,7 @@
@Test
public void doesNothingByDefault() throws Exception {
- enableRule("Code-Review", false);
+ enableRule(LabelId.CODE_REVIEW, false);
PushOneCommit.Result r = createChange();
approve(r.getChangeId());
diff --git a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java
index 6079388..bf8b1f8 100644
--- a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java
@@ -20,6 +20,7 @@
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.SubmitRecord;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.PrologOptions;
@@ -41,7 +42,7 @@
public void convertsPrologToSubmitRecord() {
PrologRuleEvaluator evaluator = makeEvaluator();
- StructureTerm verifiedLabel = makeLabel("Verified", "may");
+ StructureTerm verifiedLabel = makeLabel(LabelId.VERIFIED, "may");
StructureTerm labels = new StructureTerm("label", verifiedLabel);
List<Term> terms = ImmutableList.of(makeTerm("ok", labels));
@@ -85,12 +86,12 @@
PrologRuleEvaluator evaluator = makeEvaluator();
SubmitRecord.Label submitRecordLabel1 = new SubmitRecord.Label();
- submitRecordLabel1.label = "Verified";
+ submitRecordLabel1.label = LabelId.VERIFIED;
submitRecordLabel1.status = SubmitRecord.Label.Status.REJECT;
submitRecordLabel1.appliedBy = admin.id();
SubmitRecord.Label submitRecordLabel2 = new SubmitRecord.Label();
- submitRecordLabel2.label = "Code-Review";
+ submitRecordLabel2.label = LabelId.CODE_REVIEW;
submitRecordLabel2.status = SubmitRecord.Label.Status.OK;
submitRecordLabel2.appliedBy = admin.id();
diff --git a/javatests/com/google/gerrit/entities/LabelFunctionTest.java b/javatests/com/google/gerrit/entities/LabelFunctionTest.java
index 3941564..0132697 100644
--- a/javatests/com/google/gerrit/entities/LabelFunctionTest.java
+++ b/javatests/com/google/gerrit/entities/LabelFunctionTest.java
@@ -24,7 +24,7 @@
import org.junit.Test;
public class LabelFunctionTest {
- private static final String LABEL_NAME = "Verified";
+ private static final String LABEL_NAME = LabelId.VERIFIED;
private static final LabelId LABEL_ID = LabelId.create(LABEL_NAME);
private static final Change.Id CHANGE_ID = Change.id(100);
private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1);
@@ -39,7 +39,7 @@
public void checkLabelNameIsCorrect() {
for (LabelFunction function : LabelFunction.values()) {
SubmitRecord.Label myLabel = function.check(VERIFIED_LABEL, ImmutableList.of());
- assertThat(myLabel.label).isEqualTo("Verified");
+ assertThat(myLabel.label).isEqualTo(LabelId.VERIFIED);
}
}
diff --git a/javatests/com/google/gerrit/entities/PermissionTest.java b/javatests/com/google/gerrit/entities/PermissionTest.java
index 2915f79..3175671 100644
--- a/javatests/com/google/gerrit/entities/PermissionTest.java
+++ b/javatests/com/google/gerrit/entities/PermissionTest.java
@@ -34,9 +34,9 @@
assertThat(Permission.isPermission(Permission.ABANDON)).isTrue();
assertThat(Permission.isPermission("no-permission")).isFalse();
- assertThat(Permission.isPermission(Permission.LABEL + "Code-Review")).isTrue();
- assertThat(Permission.isPermission(Permission.LABEL_AS + "Code-Review")).isTrue();
- assertThat(Permission.isPermission("Code-Review")).isFalse();
+ assertThat(Permission.isPermission(Permission.LABEL + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.isPermission(Permission.LABEL_AS + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.isPermission(LabelId.CODE_REVIEW)).isFalse();
}
@Test
@@ -44,9 +44,9 @@
assertThat(Permission.hasRange(Permission.ABANDON)).isFalse();
assertThat(Permission.hasRange("no-permission")).isFalse();
- assertThat(Permission.hasRange(Permission.LABEL + "Code-Review")).isTrue();
- assertThat(Permission.hasRange(Permission.LABEL_AS + "Code-Review")).isTrue();
- assertThat(Permission.hasRange("Code-Review")).isFalse();
+ assertThat(Permission.hasRange(Permission.LABEL + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.hasRange(Permission.LABEL_AS + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.hasRange(LabelId.CODE_REVIEW)).isFalse();
}
@Test
@@ -54,9 +54,9 @@
assertThat(Permission.isLabel(Permission.ABANDON)).isFalse();
assertThat(Permission.isLabel("no-permission")).isFalse();
- assertThat(Permission.isLabel(Permission.LABEL + "Code-Review")).isTrue();
- assertThat(Permission.isLabel(Permission.LABEL_AS + "Code-Review")).isFalse();
- assertThat(Permission.isLabel("Code-Review")).isFalse();
+ assertThat(Permission.isLabel(Permission.LABEL + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.isLabel(Permission.LABEL_AS + LabelId.CODE_REVIEW)).isFalse();
+ assertThat(Permission.isLabel(LabelId.CODE_REVIEW)).isFalse();
}
@Test
@@ -64,27 +64,30 @@
assertThat(Permission.isLabelAs(Permission.ABANDON)).isFalse();
assertThat(Permission.isLabelAs("no-permission")).isFalse();
- assertThat(Permission.isLabelAs(Permission.LABEL + "Code-Review")).isFalse();
- assertThat(Permission.isLabelAs(Permission.LABEL_AS + "Code-Review")).isTrue();
- assertThat(Permission.isLabelAs("Code-Review")).isFalse();
+ assertThat(Permission.isLabelAs(Permission.LABEL + LabelId.CODE_REVIEW)).isFalse();
+ assertThat(Permission.isLabelAs(Permission.LABEL_AS + LabelId.CODE_REVIEW)).isTrue();
+ assertThat(Permission.isLabelAs(LabelId.CODE_REVIEW)).isFalse();
}
@Test
public void forLabel() {
- assertThat(Permission.forLabel("Code-Review")).isEqualTo(Permission.LABEL + "Code-Review");
+ assertThat(Permission.forLabel(LabelId.CODE_REVIEW))
+ .isEqualTo(Permission.LABEL + LabelId.CODE_REVIEW);
}
@Test
public void forLabelAs() {
- assertThat(Permission.forLabelAs("Code-Review")).isEqualTo(Permission.LABEL_AS + "Code-Review");
+ assertThat(Permission.forLabelAs(LabelId.CODE_REVIEW))
+ .isEqualTo(Permission.LABEL_AS + LabelId.CODE_REVIEW);
}
@Test
public void extractLabel() {
- assertThat(Permission.extractLabel(Permission.LABEL + "Code-Review")).isEqualTo("Code-Review");
- assertThat(Permission.extractLabel(Permission.LABEL_AS + "Code-Review"))
- .isEqualTo("Code-Review");
- assertThat(Permission.extractLabel("Code-Review")).isNull();
+ assertThat(Permission.extractLabel(Permission.LABEL + LabelId.CODE_REVIEW))
+ .isEqualTo(LabelId.CODE_REVIEW);
+ assertThat(Permission.extractLabel(Permission.LABEL_AS + LabelId.CODE_REVIEW))
+ .isEqualTo(LabelId.CODE_REVIEW);
+ assertThat(Permission.extractLabel(LabelId.CODE_REVIEW)).isNull();
assertThat(Permission.extractLabel(Permission.ABANDON)).isNull();
}
@@ -92,17 +95,23 @@
public void canBeOnAllProjects() {
assertThat(Permission.canBeOnAllProjects(AccessSection.ALL, Permission.ABANDON)).isTrue();
assertThat(Permission.canBeOnAllProjects(AccessSection.ALL, Permission.OWNER)).isFalse();
- assertThat(Permission.canBeOnAllProjects(AccessSection.ALL, Permission.LABEL + "Code-Review"))
+ assertThat(
+ Permission.canBeOnAllProjects(
+ AccessSection.ALL, Permission.LABEL + LabelId.CODE_REVIEW))
.isTrue();
assertThat(
- Permission.canBeOnAllProjects(AccessSection.ALL, Permission.LABEL_AS + "Code-Review"))
+ Permission.canBeOnAllProjects(
+ AccessSection.ALL, Permission.LABEL_AS + LabelId.CODE_REVIEW))
.isTrue();
assertThat(Permission.canBeOnAllProjects("refs/heads/*", Permission.ABANDON)).isTrue();
assertThat(Permission.canBeOnAllProjects("refs/heads/*", Permission.OWNER)).isTrue();
- assertThat(Permission.canBeOnAllProjects("refs/heads/*", Permission.LABEL + "Code-Review"))
+ assertThat(
+ Permission.canBeOnAllProjects("refs/heads/*", Permission.LABEL + LabelId.CODE_REVIEW))
.isTrue();
- assertThat(Permission.canBeOnAllProjects("refs/heads/*", Permission.LABEL_AS + "Code-Review"))
+ assertThat(
+ Permission.canBeOnAllProjects(
+ "refs/heads/*", Permission.LABEL_AS + LabelId.CODE_REVIEW))
.isTrue();
}
@@ -113,11 +122,11 @@
@Test
public void getLabel() {
- assertThat(Permission.create(Permission.LABEL + "Code-Review").getLabel())
- .isEqualTo("Code-Review");
- assertThat(Permission.create(Permission.LABEL_AS + "Code-Review").getLabel())
- .isEqualTo("Code-Review");
- assertThat(Permission.create("Code-Review").getLabel()).isNull();
+ assertThat(Permission.create(Permission.LABEL + LabelId.CODE_REVIEW).getLabel())
+ .isEqualTo(LabelId.CODE_REVIEW);
+ assertThat(Permission.create(Permission.LABEL_AS + LabelId.CODE_REVIEW).getLabel())
+ .isEqualTo(LabelId.CODE_REVIEW);
+ assertThat(Permission.create(LabelId.CODE_REVIEW).getLabel()).isNull();
assertThat(Permission.create(Permission.ABANDON).getLabel()).isNull();
}
diff --git a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
index 683f5a6..cd28ac4 100644
--- a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
+++ b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
@@ -109,7 +109,8 @@
});
}
LabelType lt =
- label("Verified", value(1, "Verified"), value(0, "No score"), value(-1, "Fails"));
+ label(
+ LabelId.VERIFIED, value(1, LabelId.VERIFIED), value(0, "No score"), value(-1, "Fails"));
pc.upsertLabelType(lt);
save(pc);
}
@@ -137,12 +138,16 @@
public void noNormalizeByPermission() throws Exception {
projectOperations
.allProjectsForUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
- .add(allowLabel("Verified").ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-1, 1))
+ .add(allowLabel(LabelId.VERIFIED).ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
.update();
- PatchSetApproval cr = psa(userId, "Code-Review", 2);
- PatchSetApproval v = psa(userId, "Verified", 1);
+ PatchSetApproval cr = psa(userId, LabelId.CODE_REVIEW, 2);
+ PatchSetApproval v = psa(userId, LabelId.VERIFIED, 1);
assertEquals(Result.create(list(cr, v), list(), list()), norm.normalize(notes, list(cr, v)));
}
@@ -150,12 +155,16 @@
public void normalizeByType() throws Exception {
projectOperations
.allProjectsForUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-5, 5))
- .add(allowLabel("Verified").ref("refs/heads/*").group(REGISTERED_USERS).range(-5, 5))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-5, 5))
+ .add(allowLabel(LabelId.VERIFIED).ref("refs/heads/*").group(REGISTERED_USERS).range(-5, 5))
.update();
- PatchSetApproval cr = psa(userId, "Code-Review", 5);
- PatchSetApproval v = psa(userId, "Verified", 5);
+ PatchSetApproval cr = psa(userId, LabelId.CODE_REVIEW, 5);
+ PatchSetApproval v = psa(userId, LabelId.VERIFIED, 5);
assertEquals(
Result.create(list(), list(copy(cr, 2), copy(v, 1)), list()),
norm.normalize(notes, list(cr, v)));
@@ -163,8 +172,8 @@
@Test
public void emptyPermissionRangeKeepsResult() throws Exception {
- PatchSetApproval cr = psa(userId, "Code-Review", 1);
- PatchSetApproval v = psa(userId, "Verified", 1);
+ PatchSetApproval cr = psa(userId, LabelId.CODE_REVIEW, 1);
+ PatchSetApproval v = psa(userId, LabelId.VERIFIED, 1);
assertEquals(Result.create(list(cr, v), list(), list()), norm.normalize(notes, list(cr, v)));
}
@@ -172,11 +181,15 @@
public void explicitZeroVoteOnNonEmptyRangeIsPresent() throws Exception {
projectOperations
.allProjectsForUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-1, 1))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-1, 1))
.update();
- PatchSetApproval cr = psa(userId, "Code-Review", 0);
- PatchSetApproval v = psa(userId, "Verified", 0);
+ PatchSetApproval cr = psa(userId, LabelId.CODE_REVIEW, 0);
+ PatchSetApproval v = psa(userId, LabelId.VERIFIED, 0);
assertEquals(Result.create(list(cr, v), list(), list()), norm.normalize(notes, list(cr, v)));
}
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
index 6c5bc2e..a1a1ca3 100644
--- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
+++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
@@ -363,7 +363,7 @@
PatchSetApproval.builder()
.key(
PatchSetApproval.key(
- PatchSet.id(ID, 1), Account.id(2001), LabelId.create("Code-Review")))
+ PatchSet.id(ID, 1), Account.id(2001), LabelId.create(LabelId.CODE_REVIEW)))
.value(1)
.granted(new Timestamp(1212L))
.build();
@@ -374,7 +374,7 @@
PatchSetApproval.builder()
.key(
PatchSetApproval.key(
- PatchSet.id(ID, 1), Account.id(2002), LabelId.create("Verified")))
+ PatchSet.id(ID, 1), Account.id(2002), LabelId.create(LabelId.VERIFIED)))
.value(-1)
.granted(new Timestamp(3434L))
.build();
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
index ae7727d..de49cdf 100644
--- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
+++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
@@ -45,6 +45,7 @@
import com.google.gerrit.entities.ChangeMessage;
import com.google.gerrit.entities.CommentRange;
import com.google.gerrit.entities.HumanComment;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.entities.PatchSetApproval;
import com.google.gerrit.entities.SubmissionId;
@@ -153,12 +154,12 @@
String tag2 = "ip";
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Verified", (short) -1);
+ update.putApproval(LabelId.VERIFIED, (short) -1);
update.setTag(tag1);
update.commit();
update = newUpdate(c, changeOwner);
- update.putApproval("Verified", (short) 1);
+ update.putApproval(LabelId.VERIFIED, (short) 1);
update.setTag(tag2);
update.commit();
@@ -177,7 +178,7 @@
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Verified", (short) -1);
+ update.putApproval(LabelId.VERIFIED, (short) -1);
update.setChangeMessage("integration verification");
update.setTag(integrationTag);
update.commit();
@@ -231,8 +232,8 @@
public void approvalsOnePatchSet() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Verified", (short) 1);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.VERIFIED, (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.commit();
ChangeNotes notes = newNotes(c);
@@ -242,13 +243,13 @@
assertThat(psas.get(0).patchSetId()).isEqualTo(c.currentPatchSetId());
assertThat(psas.get(0).accountId().get()).isEqualTo(1);
- assertThat(psas.get(0).label()).isEqualTo("Code-Review");
+ assertThat(psas.get(0).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psas.get(0).value()).isEqualTo((short) -1);
assertThat(psas.get(0).granted()).isEqualTo(truncate(after(c, 2000)));
assertThat(psas.get(1).patchSetId()).isEqualTo(c.currentPatchSetId());
assertThat(psas.get(1).accountId().get()).isEqualTo(1);
- assertThat(psas.get(1).label()).isEqualTo("Verified");
+ assertThat(psas.get(1).label()).isEqualTo(LabelId.VERIFIED);
assertThat(psas.get(1).value()).isEqualTo((short) 1);
assertThat(psas.get(1).granted()).isEqualTo(psas.get(0).granted());
}
@@ -257,13 +258,13 @@
public void approvalsMultiplePatchSets() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.commit();
PatchSet.Id ps1 = c.currentPatchSetId();
incrementPatchSet(c);
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
PatchSet.Id ps2 = c.currentPatchSetId();
@@ -274,14 +275,14 @@
PatchSetApproval psa1 = Iterables.getOnlyElement(psas.get(ps1));
assertThat(psa1.patchSetId()).isEqualTo(ps1);
assertThat(psa1.accountId().get()).isEqualTo(1);
- assertThat(psa1.label()).isEqualTo("Code-Review");
+ assertThat(psa1.label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psa1.value()).isEqualTo((short) -1);
assertThat(psa1.granted()).isEqualTo(truncate(after(c, 2000)));
PatchSetApproval psa2 = Iterables.getOnlyElement(psas.get(ps2));
assertThat(psa2.patchSetId()).isEqualTo(ps2);
assertThat(psa2.accountId().get()).isEqualTo(1);
- assertThat(psa2.label()).isEqualTo("Code-Review");
+ assertThat(psa2.label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psa2.value()).isEqualTo((short) +1);
assertThat(psa2.granted()).isEqualTo(truncate(after(c, 4000)));
}
@@ -290,22 +291,22 @@
public void approvalsMultipleApprovals() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.commit();
ChangeNotes notes = newNotes(c);
PatchSetApproval psa =
Iterables.getOnlyElement(notes.getApprovals().get(c.currentPatchSetId()));
- assertThat(psa.label()).isEqualTo("Code-Review");
+ assertThat(psa.label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psa.value()).isEqualTo((short) -1);
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
notes = newNotes(c);
psa = Iterables.getOnlyElement(notes.getApprovals().get(c.currentPatchSetId()));
- assertThat(psa.label()).isEqualTo("Code-Review");
+ assertThat(psa.label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psa.value()).isEqualTo((short) 1);
}
@@ -313,11 +314,11 @@
public void approvalsMultipleUsers() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.commit();
update = newUpdate(c, otherUser);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
ChangeNotes notes = newNotes(c);
@@ -327,13 +328,13 @@
assertThat(psas.get(0).patchSetId()).isEqualTo(c.currentPatchSetId());
assertThat(psas.get(0).accountId().get()).isEqualTo(1);
- assertThat(psas.get(0).label()).isEqualTo("Code-Review");
+ assertThat(psas.get(0).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psas.get(0).value()).isEqualTo((short) -1);
assertThat(psas.get(0).granted()).isEqualTo(truncate(after(c, 2000)));
assertThat(psas.get(1).patchSetId()).isEqualTo(c.currentPatchSetId());
assertThat(psas.get(1).accountId().get()).isEqualTo(2);
- assertThat(psas.get(1).label()).isEqualTo("Code-Review");
+ assertThat(psas.get(1).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psas.get(1).value()).isEqualTo((short) 1);
assertThat(psas.get(1).granted()).isEqualTo(truncate(after(c, 3000)));
}
@@ -413,8 +414,8 @@
public void putOtherUsersApprovals() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
- update.putApprovalFor(otherUser.getAccountId(), "Code-Review", (short) -1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
+ update.putApprovalFor(otherUser.getAccountId(), LabelId.CODE_REVIEW, (short) -1);
update.commit();
ChangeNotes notes = newNotes(c);
@@ -425,11 +426,11 @@
assertThat(approvals).hasSize(2);
assertThat(approvals.get(0).accountId()).isEqualTo(changeOwner.getAccountId());
- assertThat(approvals.get(0).label()).isEqualTo("Code-Review");
+ assertThat(approvals.get(0).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(approvals.get(0).value()).isEqualTo((short) 1);
assertThat(approvals.get(1).accountId()).isEqualTo(otherUser.getAccountId());
- assertThat(approvals.get(1).label()).isEqualTo("Code-Review");
+ assertThat(approvals.get(1).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(approvals.get(1).value()).isEqualTo((short) -1);
}
@@ -438,8 +439,8 @@
Change c = newChange();
SubmissionId submissionId = new SubmissionId(c);
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
- update.putApproval("Verified", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
+ update.putApproval(LabelId.VERIFIED, (short) 1);
update.commit();
update = newUpdate(c, changeOwner);
@@ -449,21 +450,21 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
- submitLabel("Code-Review", "NEED", null))));
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.CODE_REVIEW, "NEED", null))));
update.commit();
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 2);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 2);
update.commit();
ChangeNotes notes = newNotes(c);
List<PatchSetApproval> approvals = Lists.newArrayList(notes.getApprovals().values());
assertThat(approvals).hasSize(2);
- assertThat(approvals.get(0).label()).isEqualTo("Verified");
+ assertThat(approvals.get(0).label()).isEqualTo(LabelId.VERIFIED);
assertThat(approvals.get(0).value()).isEqualTo((short) 1);
assertThat(approvals.get(0).postSubmit()).isFalse();
- assertThat(approvals.get(1).label()).isEqualTo("Code-Review");
+ assertThat(approvals.get(1).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(approvals.get(1).value()).isEqualTo((short) 2);
assertThat(approvals.get(1).postSubmit()).isTrue();
}
@@ -473,8 +474,8 @@
Change c = newChange();
SubmissionId submissionId = new SubmissionId(c);
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
- update.putApproval("Verified", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
+ update.putApproval(LabelId.VERIFIED, (short) 1);
update.commit();
Account.Id ownerId = changeOwner.getAccountId();
@@ -486,10 +487,10 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", ownerId),
- submitLabel("Code-Review", "NEED", null))));
+ submitLabel(LabelId.VERIFIED, "OK", ownerId),
+ submitLabel(LabelId.CODE_REVIEW, "NEED", null))));
update.putApproval("Other-Label", (short) 1);
- update.putApprovalFor(ownerId, "Code-Review", (short) 2);
+ update.putApprovalFor(ownerId, LabelId.CODE_REVIEW, (short) 2);
update.commit();
update = newUpdate(c, otherUser);
@@ -501,11 +502,11 @@
List<PatchSetApproval> approvals = Lists.newArrayList(notes.getApprovals().values());
assertThat(approvals).hasSize(3);
assertThat(approvals.get(0).accountId()).isEqualTo(ownerId);
- assertThat(approvals.get(0).label()).isEqualTo("Verified");
+ assertThat(approvals.get(0).label()).isEqualTo(LabelId.VERIFIED);
assertThat(approvals.get(0).value()).isEqualTo(1);
assertThat(approvals.get(0).postSubmit()).isFalse();
assertThat(approvals.get(1).accountId()).isEqualTo(ownerId);
- assertThat(approvals.get(1).label()).isEqualTo("Code-Review");
+ assertThat(approvals.get(1).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(approvals.get(1).value()).isEqualTo(2);
assertThat(approvals.get(1).postSubmit()).isFalse(); // During submit.
assertThat(approvals.get(2).accountId()).isEqualTo(otherId);
@@ -582,11 +583,11 @@
update.commit();
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
update = newUpdate(c, otherUser);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
ChangeNotes notes = newNotes(c);
@@ -618,12 +619,12 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
- submitLabel("Code-Review", "NEED", null)),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.CODE_REVIEW, "NEED", null)),
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
submitLabel("Alternative-Code-Review", "NEED", null))));
update.commit();
@@ -635,14 +636,14 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
- submitLabel("Code-Review", "NEED", null)));
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.CODE_REVIEW, "NEED", null)));
assertThat(recs.get(1))
.isEqualTo(
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
submitLabel("Alternative-Code-Review", "NEED", null)));
assertThat(notes.getChange().getSubmissionId()).isEqualTo(submissionId.toString());
}
@@ -656,7 +657,8 @@
update.merge(
submissionId,
ImmutableList.of(
- submitRecord("OK", null, submitLabel("Code-Review", "OK", otherUser.getAccountId()))));
+ submitRecord(
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", otherUser.getAccountId()))));
update.commit();
incrementPatchSet(c);
@@ -666,13 +668,14 @@
submissionId,
ImmutableList.of(
submitRecord(
- "OK", null, submitLabel("Code-Review", "OK", changeOwner.getAccountId()))));
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", changeOwner.getAccountId()))));
update.commit();
ChangeNotes notes = newNotes(c);
assertThat(notes.getSubmitRecords())
.containsExactly(
- submitRecord("OK", null, submitLabel("Code-Review", "OK", changeOwner.getAccountId())));
+ submitRecord(
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", changeOwner.getAccountId())));
assertThat(notes.getChange().getSubmissionId()).isEqualTo(submissionId.toString());
}
@@ -697,7 +700,8 @@
update.merge(
submissionId,
ImmutableList.of(
- submitRecord("OK", null, submitLabel("Code-Review", "OK", otherUser.getAccountId()))));
+ submitRecord(
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", otherUser.getAccountId()))));
update.commit();
ChangeNotes notes = newNotes(c);
assertThat(notes.getMergedOn()).isPresent();
@@ -706,7 +710,7 @@
// Next update does not change mergedOn date.
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
notes = newNotes(c);
assertThat(notes.getMergedOn().get()).isEqualTo(mergedOn);
@@ -722,7 +726,8 @@
update.merge(
submissionId,
ImmutableList.of(
- submitRecord("OK", null, submitLabel("Code-Review", "OK", otherUser.getAccountId()))));
+ submitRecord(
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", otherUser.getAccountId()))));
update.commit();
ChangeNotes notes = newNotes(c);
assertThat(notes.getMergedOn()).isPresent();
@@ -736,7 +741,7 @@
submissionId,
ImmutableList.of(
submitRecord(
- "OK", null, submitLabel("Code-Review", "OK", changeOwner.getAccountId()))));
+ "OK", null, submitLabel(LabelId.CODE_REVIEW, "OK", changeOwner.getAccountId()))));
update.commit();
notes = newNotes(c);
@@ -1162,7 +1167,7 @@
assertThat(ts5).isGreaterThan(ts4);
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
Timestamp ts6 = newNotes(c).getChange().getLastUpdatedOn();
assertThat(ts6).isGreaterThan(ts5);
@@ -1193,7 +1198,7 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
submitLabel("Alternative-Code-Review", "NEED", null))));
update.commit();
Timestamp ts10 = newNotes(c).getChange().getLastUpdatedOn();
@@ -1297,7 +1302,7 @@
RevCommit commit = tr.commit().message("PS2").create();
ChangeUpdate update = newUpdate(c, changeOwner);
update.setCommit(rw, commit);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.setChangeMessage("This is a message");
update.putComment(
HumanComment.Status.PUBLISHED,
@@ -1435,10 +1440,10 @@
public void multipleUpdatesInManager() throws Exception {
Change c = newChange();
ChangeUpdate update1 = newUpdate(c, changeOwner);
- update1.putApproval("Verified", (short) 1);
+ update1.putApproval(LabelId.VERIFIED, (short) 1);
ChangeUpdate update2 = newUpdate(c, otherUser);
- update2.putApproval("Code-Review", (short) 2);
+ update2.putApproval(LabelId.CODE_REVIEW, (short) 2);
try (NoteDbUpdateManager updateManager = updateManagerFactory.create(project)) {
updateManager.add(update1);
@@ -1451,11 +1456,11 @@
assertThat(psas).hasSize(2);
assertThat(psas.get(0).accountId()).isEqualTo(changeOwner.getAccount().id());
- assertThat(psas.get(0).label()).isEqualTo("Verified");
+ assertThat(psas.get(0).label()).isEqualTo(LabelId.VERIFIED);
assertThat(psas.get(0).value()).isEqualTo((short) 1);
assertThat(psas.get(1).accountId()).isEqualTo(otherUser.getAccount().id());
- assertThat(psas.get(1).label()).isEqualTo("Code-Review");
+ assertThat(psas.get(1).label()).isEqualTo(LabelId.CODE_REVIEW);
assertThat(psas.get(1).value()).isEqualTo((short) 2);
}
@@ -1489,7 +1494,7 @@
updateManager.add(update1);
ChangeUpdate update2 = newUpdate(c, otherUser);
- update2.putApproval("Code-Review", (short) 2);
+ update2.putApproval(LabelId.CODE_REVIEW, (short) 2);
updateManager.add(update2);
updateManager.execute();
@@ -1528,11 +1533,11 @@
public void multipleUpdatesAcrossRefs() throws Exception {
Change c1 = newChange();
ChangeUpdate update1 = newUpdate(c1, changeOwner);
- update1.putApproval("Verified", (short) 1);
+ update1.putApproval(LabelId.VERIFIED, (short) 1);
Change c2 = newChange();
ChangeUpdate update2 = newUpdate(c2, otherUser);
- update2.putApproval("Code-Review", (short) 2);
+ update2.putApproval(LabelId.CODE_REVIEW, (short) 2);
Ref initial1 = repo.exactRef(update1.getRefName());
assertThat(initial1).isNotNull();
@@ -1554,11 +1559,11 @@
PatchSetApproval approval1 =
newNotes(c1).getApprovals().get(c1.currentPatchSetId()).iterator().next();
- assertThat(approval1.label()).isEqualTo("Verified");
+ assertThat(approval1.label()).isEqualTo(LabelId.VERIFIED);
PatchSetApproval approval2 =
newNotes(c2).getApprovals().get(c2.currentPatchSetId()).iterator().next();
- assertThat(approval2.label()).isEqualTo("Code-Review");
+ assertThat(approval2.label()).isEqualTo(LabelId.CODE_REVIEW);
}
@Test
@@ -2772,7 +2777,8 @@
ChangeUpdate failingUpdate = newUpdate(c, internalUser);
assertThrows(
- IllegalStateException.class, () -> failingUpdate.putApproval("Code-Review", (short) 1));
+ IllegalStateException.class,
+ () -> failingUpdate.putApproval(LabelId.CODE_REVIEW, (short) 1));
}
@Test
@@ -2934,7 +2940,7 @@
ChangeUpdate update = newUpdate(c, changeOwner);
update.setPatchSetId(PatchSet.id(c.getId(), c.currentPatchSetId().get() + 1));
update.setChangeMessage("Should be ignored");
- update.putApproval("Code-Review", (short) 2);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 2);
CommentRange range = new CommentRange(1, 1, 2, 1);
HumanComment comment =
newComment(
@@ -3291,12 +3297,12 @@
assertThat(newNotes(c).getUpdateCount()).isEqualTo(1);
ChangeUpdate update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.commit();
assertThat(newNotes(c).getUpdateCount()).isEqualTo(2);
update = newUpdate(c, changeOwner);
- update.putApproval("Code-Review", (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) 1);
update.commit();
assertThat(newNotes(c).getUpdateCount()).isEqualTo(3);
}
diff --git a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
index ededc42..68a1d9d 100644
--- a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
+++ b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
@@ -22,6 +22,7 @@
import com.google.gerrit.entities.Account;
import com.google.gerrit.entities.Address;
import com.google.gerrit.entities.Change;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.SubmissionId;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.util.time.TimeUtil;
@@ -39,8 +40,8 @@
public void approvalsCommitFormatSimple() throws Exception {
Change c = TestChanges.newChange(project, changeOwner.getAccountId(), 1);
ChangeUpdate update = newUpdateForNewChange(c, changeOwner);
- update.putApproval("Verified", (short) 1);
- update.putApproval("Code-Review", (short) -1);
+ update.putApproval(LabelId.VERIFIED, (short) 1);
+ update.putApproval(LabelId.CODE_REVIEW, (short) -1);
update.putReviewer(changeOwner.getAccount().id(), REVIEWER);
update.putReviewer(otherUser.getAccount().id(), CC);
update.commit();
@@ -134,7 +135,7 @@
public void approvalTombstoneCommitFormat() throws Exception {
Change c = newChange();
ChangeUpdate update = newUpdate(c, changeOwner);
- update.removeApproval("Code-Review");
+ update.removeApproval(LabelId.CODE_REVIEW);
update.commit();
assertBodyEquals(
@@ -154,12 +155,12 @@
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
- submitLabel("Code-Review", "NEED", null)),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.CODE_REVIEW, "NEED", null)),
submitRecord(
"NOT_READY",
null,
- submitLabel("Verified", "OK", changeOwner.getAccountId()),
+ submitLabel(LabelId.VERIFIED, "OK", changeOwner.getAccountId()),
submitLabel("Alternative-Code-Review", "NEED", null))));
update.commit();
diff --git a/javatests/com/google/gerrit/server/permissions/RefControlTest.java b/javatests/com/google/gerrit/server/permissions/RefControlTest.java
index 87db21f..c5bef59 100644
--- a/javatests/com/google/gerrit/server/permissions/RefControlTest.java
+++ b/javatests/com/google/gerrit/server/permissions/RefControlTest.java
@@ -40,6 +40,7 @@
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.PermissionRange;
import com.google.gerrit.entities.Project;
@@ -651,12 +652,13 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/master").group(DEVS).range(+1, +2))
+ .add(blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/master").group(DEVS).range(+1, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(2, range);
}
@@ -665,17 +667,18 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
projectOperations
.project(parentKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-1, range);
assertCanVote(1, range);
assertCannotVote(-2, range);
@@ -687,18 +690,19 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
projectOperations
.project(parentKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-1, range);
assertCanVote(1, range);
assertCannotVote(-2, range);
@@ -832,13 +836,15 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, 1))
- .add(allowLabel("Code-Review").ref("refs/heads/master").group(DEVS).range(-2, 2))
- .setExclusiveGroup(labelPermissionKey("Code-Review").ref("refs/heads/master"), true)
+ .add(
+ blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, 1))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/master").group(DEVS).range(-2, 2))
+ .setExclusiveGroup(labelPermissionKey(LabelId.CODE_REVIEW).ref("refs/heads/master"), true)
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-2, range);
}
@@ -1013,12 +1019,17 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, +1))
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(ANONYMOUS_USERS)
+ .range(-1, +1))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-2, range);
assertCanVote(2, range);
}
@@ -1028,12 +1039,17 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, +1))
- .add(allowLabel("Code-Review").ref("refs/heads/master").group(DEVS).range(-2, +2))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(ANONYMOUS_USERS)
+ .range(-1, +1))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/master").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-2, range);
assertCannotVote(2, range);
}
@@ -1044,12 +1060,16 @@
.project(localKey)
.forUpdate()
.add(
- blockLabel("Code-Review").ref("refs/heads/master").group(ANONYMOUS_USERS).range(-1, +1))
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/master")
+ .group(ANONYMOUS_USERS)
+ .range(-1, +1))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-2, range);
assertCannotVote(2, range);
}
@@ -1059,11 +1079,12 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, REGISTERED_USERS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-1, range);
assertCannotVote(1, range);
}
@@ -1073,16 +1094,18 @@
projectOperations
.project(parentKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, 1))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(ANONYMOUS_USERS).range(-1, 1))
.update();
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-2, range);
assertCannotVote(2, range);
}
@@ -1092,12 +1115,12 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
PermissionRange range =
- u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review", true);
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW, true);
assertCanVote(-2, range);
assertCanVote(2, range);
}
@@ -1107,11 +1130,12 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-2, range);
assertCannotVote(2, range);
}
@@ -1121,11 +1145,12 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
+ .add(blockLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(CHANGE_OWNER).range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCannotVote(-2, range);
assertCannotVote(2, range);
}
@@ -1135,12 +1160,17 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-1, +1))
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-1, +1))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, +2))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-2, range);
assertCanVote(2, range);
}
@@ -1150,12 +1180,17 @@
projectOperations
.project(localKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, +2))
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-1, +1))
+ .add(
+ allowLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-1, +1))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-2, range);
assertCanVote(2, range);
}
@@ -1165,17 +1200,26 @@
projectOperations
.project(parentKey)
.forUpdate()
- .add(allowLabel("Code-Review").ref("refs/heads/*").group(DEVS).range(-1, +1))
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, +2))
+ .add(allowLabel(LabelId.CODE_REVIEW).ref("refs/heads/*").group(DEVS).range(-1, +1))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, +2))
.update();
projectOperations
.project(localKey)
.forUpdate()
- .add(blockLabel("Code-Review").ref("refs/heads/*").group(REGISTERED_USERS).range(-2, +1))
+ .add(
+ blockLabel(LabelId.CODE_REVIEW)
+ .ref("refs/heads/*")
+ .group(REGISTERED_USERS)
+ .range(-2, +1))
.update();
ProjectControl u = user(localKey, DEVS);
- PermissionRange range = u.controlForRef("refs/heads/master").getRange(LABEL + "Code-Review");
+ PermissionRange range =
+ u.controlForRef("refs/heads/master").getRange(LABEL + LabelId.CODE_REVIEW);
assertCanVote(-1, range);
assertCannotVote(1, range);
}
diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index e440be0..7efcb4b 100644
--- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -49,6 +49,7 @@
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.Change;
import com.google.gerrit.entities.GroupReference;
+import com.google.gerrit.entities.LabelId;
import com.google.gerrit.entities.LabelType;
import com.google.gerrit.entities.Patch;
import com.google.gerrit.entities.PatchSet;
@@ -1008,7 +1009,7 @@
Project.nameKey(repo.getRepository().getDescription().getRepositoryName());
LabelType verified =
- label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+ label(LabelId.VERIFIED, value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
try (MetaDataUpdate md = metaDataUpdateFactory.create(project)) {
ProjectConfig cfg = projectConfigFactory.create(project);
cfg.load(md);
@@ -1024,7 +1025,7 @@
.add(allowLabel(verified.getName()).ref(heads).group(REGISTERED_USERS).range(-1, 1))
.update();
- ReviewInput reviewVerified = new ReviewInput().label("Verified", 1);
+ ReviewInput reviewVerified = new ReviewInput().label(LabelId.VERIFIED, 1);
ChangeInserter ins = newChange(repo);
ChangeInserter ins2 = newChange(repo);
ChangeInserter ins3 = newChange(repo);
diff --git a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java
index cf5e8fe..e5dd817 100644
--- a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java
+++ b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java
@@ -34,12 +34,12 @@
public class IgnoreSelfApprovalRuleTest {
private static final Change.Id CHANGE_ID = Change.id(100);
private static final PatchSet.Id PS_ID = PatchSet.id(CHANGE_ID, 1);
- private static final LabelType VERIFIED = makeLabel("Verified");
+ private static final LabelType VERIFIED = makeLabel(LabelId.VERIFIED);
private static final Account.Id USER1 = makeAccount(100001);
@Test
public void filtersByLabel() {
- LabelType codeReview = makeLabel("Code-Review");
+ LabelType codeReview = makeLabel(LabelId.CODE_REVIEW);
PatchSetApproval approvalVerified = makeApproval(VERIFIED.getLabelId(), USER1, 2);
PatchSetApproval approvalCr = makeApproval(codeReview.getLabelId(), USER1, 2);
diff --git a/javatests/com/google/gerrit/server/rules/PrologRuleEvaluatorTest.java b/javatests/com/google/gerrit/server/rules/PrologRuleEvaluatorTest.java
index 8622b32..a5357e1 100644
--- a/javatests/com/google/gerrit/server/rules/PrologRuleEvaluatorTest.java
+++ b/javatests/com/google/gerrit/server/rules/PrologRuleEvaluatorTest.java
@@ -16,13 +16,14 @@
import static com.google.common.truth.Truth.assertThat;
+import com.google.gerrit.entities.LabelId;
import org.junit.Test;
public class PrologRuleEvaluatorTest {
@Test
public void validLabelNamesAreKept() {
- for (String labelName : new String[] {"Verified", "Code-Review"}) {
+ for (String labelName : new String[] {LabelId.VERIFIED, LabelId.CODE_REVIEW}) {
assertThat(PrologRuleEvaluator.checkLabelName(labelName)).isEqualTo(labelName);
}
}
