Submit requirements: Use correct upper case Code-Review label consistently We observed test flakes where label votes where not applied correctly. This change makes casing consistent in tests and removes the @Ignore annotation. Change-Id: I6fdcb3b8460a0c05939b177b9bda06e09d7d6912
diff --git a/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java b/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java index 900b2e2..9e4416b 100644 --- a/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java +++ b/java/com/google/gerrit/entities/SubmitRequirementExpressionResult.java
@@ -39,17 +39,17 @@ /** * List leaf predicates that are fulfilled, for example the expression * - * <p><i>label:code-review=+2 and branch:refs/heads/master</i> + * <p><i>label:Code-Review=+2 and branch:refs/heads/master</i> * * <p>has two leaf predicates: * * <ul> - * <li>label:code-review=+2 + * <li>label:Code-Review=+2 * <li>branch:refs/heads/master * </ul> * * This method will return the leaf predicates that were fulfilled, for example if only the first - * predicate was fulfilled, the returned list will be equal to ["label:code-review=+2"]. + * predicate was fulfilled, the returned list will be equal to ["label:Code-Review=+2"]. */ public abstract ImmutableList<String> passingAtoms();
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 0d7210f..74407c0 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -225,7 +225,6 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.PushResult; -import org.junit.Ignore; import org.junit.Test; @NoHttpd @@ -4059,7 +4058,7 @@ assertThat(testLabel.status).isEqualTo(SubmitRecordInfo.Label.Status.OK); assertThat(testLabel.appliedBy).isNull(); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); // Code review record is satisfied after voting +2 change = gApi.changes().id(changeId).get(); assertThat(change.submitRecords).hasSize(2); @@ -4166,9 +4165,9 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setSubmittabilityExpression( - SubmitRequirementExpression.create("label:code-review=MAX")) + SubmitRequirementExpression.create("label:Code-Review=MAX")) .setAllowOverrideInChildProjects(false) .build()); @@ -4178,13 +4177,13 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); } @Test @@ -4239,9 +4238,9 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setSubmittabilityExpression( - SubmitRequirementExpression.create("-label:code-review=MIN")) + SubmitRequirementExpression.create("-label:Code-Review=MIN")) .setAllowOverrideInChildProjects(false) .build()); @@ -4252,27 +4251,27 @@ assertThat(change.submitRequirements).hasSize(2); // Requirement is satisfied because there are no votes assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); // Legacy requirement (coming from the label function definition) is not satisfied. We return // both legacy and non-legacy requirements in this case since their statuses are not identical. assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); - voteLabel(changeId, "code-review", -1); + voteLabel(changeId, "Code-Review", -1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); // Requirement is still satisfied because -1 is not the max negative value assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); - voteLabel(changeId, "code-review", -2); + voteLabel(changeId, "Code-Review", -2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); // Requirement is now unsatisfied because -2 is the max negative value assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); } @Test @@ -4335,9 +4334,9 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setSubmittabilityExpression( - SubmitRequirementExpression.create("label:code-review=ANY")) + SubmitRequirementExpression.create("label:Code-Review=ANY")) .setAllowOverrideInChildProjects(false) .build()); @@ -4347,14 +4346,14 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 1); + voteLabel(changeId, "Code-Review", 1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); // Legacy and non-legacy requirements have mismatching status. Both are returned from the API. assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); } @@ -4368,15 +4367,15 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); configSubmitRequirement( project, SubmitRequirement.builder() - .setName("verified") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:verified=+1")) + .setName("Verified") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Verified=+1")) .setAllowOverrideInChildProjects(false) .build()); @@ -4386,18 +4385,18 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); assertSubmitRequirementStatus( - change.submitRequirements, "verified", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Verified", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); assertSubmitRequirementStatus( - change.submitRequirements, "verified", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Verified", Status.UNSATISFIED, /* isLegacy= */ false); } @Test @@ -4409,9 +4408,9 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setApplicabilityExpression(SubmitRequirementExpression.of("project:foo")) - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); @@ -4421,7 +4420,7 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.NOT_APPLICABLE, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.NOT_APPLICABLE, /* isLegacy= */ false); assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); } @@ -4445,8 +4444,8 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(false) .build()); @@ -4456,36 +4455,38 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); voteLabel(changeId, "build-cop-override", 1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.OVERRIDDEN, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.OVERRIDDEN, /* isLegacy= */ false); assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); } @Test - @Ignore("Test is flaky") + @GerritConfig( + name = "experiments.enabled", + value = ExperimentFeaturesConstants.GERRIT_BACKEND_REQUEST_FEATURE_ENABLE_SUBMIT_REQUIREMENTS) public void submitRequirement_overriddenInChildProject() throws Exception { configSubmitRequirement( allProjects, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+1")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+1")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(true) .build()); - // Override submit requirement in child project (requires code-review=+2 instead of +1) + // Override submit requirement in child project (requires Code-Review=+2 instead of +1) configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(false) .build()); @@ -4495,19 +4496,19 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 1); + voteLabel(changeId, "Code-Review", 1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); } @Test @@ -4518,8 +4519,8 @@ configSubmitRequirement( allProjects, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+1")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+1")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(false) .build()); @@ -4529,13 +4530,13 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 1); + voteLabel(changeId, "Code-Review", 1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); // Legacy requirement is coming from the label MaxWithBlock function. Still unsatisfied. assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); @@ -4550,19 +4551,19 @@ configSubmitRequirement( allProjects, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+1")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+1")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(false) .build()); - // Override submit requirement in child project (requires code-review=+2 instead of +1). + // Override submit requirement in child project (requires Code-Review=+2 instead of +1). // Will have no effect since parent does not allow override. configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setOverrideExpression(SubmitRequirementExpression.of("label:build-cop-override=+1")) .setAllowOverrideInChildProjects(false) .build()); @@ -4572,14 +4573,14 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 1); + voteLabel(changeId, "Code-Review", 1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(2); // +1 was enough to fulfill the requirement: override in child project was ignored assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); // Legacy requirement is coming from the label MaxWithBlock function. Still unsatisfied. assertSubmitRequirementStatus( change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ true); @@ -4600,9 +4601,9 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setSubmittabilityExpression( - SubmitRequirementExpression.create("label:code-review=+2")) + SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); @@ -4610,12 +4611,12 @@ createChange(repo, "master", "Add a file", "foo", "content", "topic"); String changeId = r.getChangeId(); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); RevisionApi revision = gApi.changes().id(r.getChangeId()).current(); revision.review(ReviewInput.approve()); @@ -4629,7 +4630,7 @@ assertThat(result.submittabilityExpressionResult().status()) .isEqualTo(SubmitRequirementExpressionResult.Status.PASS); assertThat(result.submittabilityExpressionResult().expression().expressionString()) - .isEqualTo("label:code-review=+2"); + .isEqualTo("label:Code-Review=+2"); } } @@ -4645,8 +4646,8 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); @@ -4656,14 +4657,14 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.UNSATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.UNSATISFIED, /* isLegacy= */ false); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); gApi.changes().id(changeId).current().submit(); @@ -4671,16 +4672,16 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("verified") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:verified=+1")) + .setName("Verified") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Verified=+1")) .setAllowOverrideInChildProjects(false) .build()); - // The new "verified" submit requirement is not returned, since this change is closed + // The new "Verified" submit requirement is not returned, since this change is closed change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).hasSize(1); assertSubmitRequirementStatus( - change.submitRequirements, "code-review", Status.SATISFIED, /* isLegacy= */ false); + change.submitRequirements, "Code-Review", Status.SATISFIED, /* isLegacy= */ false); } @Test @@ -4869,15 +4870,15 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); PushOneCommit.Result r = createChange(); String changeId = r.getChangeId(); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); // Query the change. ChangeInfo is back-filled from the change index. List<ChangeInfo> changeInfos = @@ -4889,7 +4890,7 @@ assertThat(changeInfos).hasSize(1); assertSubmitRequirementStatus( changeInfos.get(0).submitRequirements, - "code-review", + "Code-Review", Status.SATISFIED, /* isLegacy= */ false); } @@ -4906,15 +4907,15 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); PushOneCommit.Result r = createChange(); String changeId = r.getChangeId(); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); gApi.changes().id(changeId).current().submit(); // Query the change. ChangeInfo is back-filled from the change index. @@ -4927,7 +4928,7 @@ assertThat(changeInfos).hasSize(1); assertSubmitRequirementStatus( changeInfos.get(0).submitRequirements, - "code-review", + "Code-Review", Status.SATISFIED, /* isLegacy= */ false); } @@ -4937,8 +4938,8 @@ configSubmitRequirement( project, SubmitRequirement.builder() - .setName("code-review") - .setSubmittabilityExpression(SubmitRequirementExpression.create("label:code-review=+2")) + .setName("Code-Review") + .setSubmittabilityExpression(SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()); @@ -4948,11 +4949,11 @@ ChangeInfo change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).isEmpty(); - voteLabel(changeId, "code-review", -1); + voteLabel(changeId, "Code-Review", -1); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).isEmpty(); - voteLabel(changeId, "code-review", 2); + voteLabel(changeId, "Code-Review", 2); change = gApi.changes().id(changeId).get(); assertThat(change.submitRequirements).isEmpty();
diff --git a/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsEvaluatorIT.java b/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsEvaluatorIT.java index 6e19c39..f511683 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsEvaluatorIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsEvaluatorIT.java
@@ -138,13 +138,13 @@ SubmitRequirement sr = createSubmitRequirement( /* applicabilityExpr= */ "project:" + project.get(), - /* submittabilityExpr= */ "label:\"code-review=+2\"", + /* submittabilityExpr= */ "label:\"Code-Review=+2\"", /* overrideExpr= */ ""); SubmitRequirementResult result = evaluator.evaluateRequirement(sr, changeData); assertThat(result.status()).isEqualTo(SubmitRequirementResult.Status.UNSATISFIED); assertThat(result.submittabilityExpressionResult().failingAtoms()) - .containsExactly("label:\"code-review=+2\""); + .containsExactly("label:\"Code-Review=+2\""); } @Test @@ -160,7 +160,7 @@ SubmitRequirement sr = createSubmitRequirement( /* applicabilityExpr= */ "project:" + project.get(), - /* submittabilityExpr= */ "label:\"code-review=+2\"", + /* submittabilityExpr= */ "label:\"Code-Review=+2\"", /* overrideExpr= */ "label:\"build-cop-override=+1\""); SubmitRequirementResult result = evaluator.evaluateRequirement(sr, changeData); @@ -175,7 +175,7 @@ SubmitRequirement sr = createSubmitRequirement( /* applicabilityExpr= */ "invalid_field:invalid_value", - /* submittabilityExpr= */ "label:\"code-review=+2\"", + /* submittabilityExpr= */ "label:\"Code-Review=+2\"", /* overrideExpr= */ "label:\"build-cop-override=+1\""); SubmitRequirementResult result = evaluator.evaluateRequirement(sr, changeData); @@ -206,7 +206,7 @@ SubmitRequirement sr = createSubmitRequirement( /* applicabilityExpr= */ "project:" + project.get(), - /* submittabilityExpr= */ "label:\"code-review=+2\"", + /* submittabilityExpr= */ "label:\"Code-Review=+2\"", /* overrideExpr= */ "invalid_field:invalid_value"); SubmitRequirementResult result = evaluator.evaluateRequirement(sr, changeData);
diff --git a/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsValidationIT.java b/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsValidationIT.java index 85dfd4d..d8aa789 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsValidationIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/SubmitRequirementsValidationIT.java
@@ -50,7 +50,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\"")); + /* value= */ "label:\"Code-Review=+2\"")); PushResult r = pushRefsMetaConfig(); assertOkStatus(r); @@ -77,7 +77,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); projectConfig.setString( ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, @@ -109,7 +109,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ null, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); }); PushResult r = pushRefsMetaConfig(); @@ -177,12 +177,12 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); projectConfig.setString( ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName.toLowerCase(Locale.US), /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); }); PushResult r = pushRefsMetaConfig(); @@ -204,7 +204,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\"")); + /* value= */ "label:\"Code-Review=+2\"")); PushResult r = pushRefsMetaConfig(); assertOkStatus(r); @@ -214,7 +214,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName.toLowerCase(Locale.US), /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\"")); + /* value= */ "label:\"Code-Review=+2\"")); r = pushRefsMetaConfig(); assertErrorStatus( r, @@ -291,7 +291,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); projectConfig.setString( ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, @@ -326,7 +326,7 @@ ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName, /* name= */ ProjectConfig.KEY_SR_SUBMITTABILITY_EXPRESSION, - /* value= */ "label:\"code-review=+2\""); + /* value= */ "label:\"Code-Review=+2\""); projectConfig.setString( ProjectConfig.SUBMIT_REQUIREMENT, /* subsection= */ submitRequirementName,
diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementSerializerTest.java index a1dee1a..6993dfe 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/SubmitRequirementSerializerTest.java
@@ -26,7 +26,7 @@ public class SubmitRequirementSerializerTest { private static final SubmitRequirement submitReq = SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setDescription(Optional.of("require code review +2")) .setApplicabilityExpression(SubmitRequirementExpression.of("branch(refs/heads/master)")) .setSubmittabilityExpression(SubmitRequirementExpression.create("label(code-review, 2+)"))
diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index 61002f9..0c26f1a 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java
@@ -696,7 +696,7 @@ .setApplicabilityExpression( SubmitRequirementExpression.of("project:foo")) .setSubmittabilityExpression( - SubmitRequirementExpression.create("label:code-review=+2")) + SubmitRequirementExpression.create("label:Code-Review=+2")) .setAllowOverrideInChildProjects(false) .build()) .applicabilityExpressionResult( @@ -708,10 +708,10 @@ ImmutableList.of()))) .submittabilityExpressionResult( SubmitRequirementExpressionResult.create( - SubmitRequirementExpression.create("label:code-review=+2"), + SubmitRequirementExpression.create("label:Code-Review=+2"), SubmitRequirementExpressionResult.Status.FAIL, ImmutableList.of(), - ImmutableList.of("label:code-review=+2"))) + ImmutableList.of("label:Code-Review=+2"))) .build())) .build(), newProtoBuilder() @@ -726,7 +726,7 @@ SubmitRequirementProto.newBuilder() .setName("Code-Review") .setApplicabilityExpression("project:foo") - .setSubmittabilityExpression("label:code-review=+2") + .setSubmittabilityExpression("label:Code-Review=+2") .setAllowOverrideInChildProjects(false) .build()) .setApplicabilityExpressionResult( @@ -737,9 +737,9 @@ .build()) .setSubmittabilityExpressionResult( SubmitRequirementExpressionResultProto.newBuilder() - .setExpression("label:code-review=+2") + .setExpression("label:Code-Review=+2") .setStatus("FAIL") - .addFailingAtoms("label:code-review=+2") + .addFailingAtoms("label:Code-Review=+2") .build()) .build()) .build());
diff --git a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java index 48ef85d8..aed1648 100644 --- a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java +++ b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java
@@ -217,7 +217,7 @@ "[submit-requirement \"Code-review\"]\n" + " description = At least one Code Review +2\n" + " applicableIf =branch(refs/heads/master)\n" - + " submittableIf = label(code-review, +2)\n" + + " submittableIf = label(Code-Review, +2)\n" + "[submit-requirement \"api-review\"]\n" + " description = Additional review required for API modifications\n" + " applicableIf =commit_filepath_contains(\\\"/api/.*\\\")\n" @@ -237,7 +237,7 @@ .setApplicabilityExpression( SubmitRequirementExpression.of("branch(refs/heads/master)")) .setSubmittabilityExpression( - SubmitRequirementExpression.create("label(code-review, +2)")) + SubmitRequirementExpression.create("label(Code-Review, +2)")) .setOverrideExpression(Optional.empty()) .setAllowOverrideInChildProjects(false) .build(), @@ -262,19 +262,19 @@ .add("groups", group(developers)) .add( "project.config", - "[submit-requirement \"code-review\"]\n" - + " submittableIf = label(code-review, +2)\n") + "[submit-requirement \"Code-Review\"]\n" + + " submittableIf = label(Code-Review, +2)\n") .create(); ProjectConfig cfg = read(rev); Map<String, SubmitRequirement> submitRequirements = cfg.getSubmitRequirementSections(); assertThat(submitRequirements) .containsExactly( - "code-review", + "Code-Review", SubmitRequirement.builder() - .setName("code-review") + .setName("Code-Review") .setSubmittabilityExpression( - SubmitRequirementExpression.create("label(code-review, +2)")) + SubmitRequirementExpression.create("label(Code-Review, +2)")) .setAllowOverrideInChildProjects(false) .build()); } @@ -320,8 +320,8 @@ .add("groups", group(developers)) .add( "project.config", - "[submit-requirement \"code-review\"]\n" - + " applicableIf =label(code-review, +2)\n") + "[submit-requirement \"Code-Review\"]\n" + + " applicableIf =label(Code-Review, +2)\n") .create(); ProjectConfig cfg = read(rev); @@ -331,8 +331,8 @@ assertThat(Iterables.getOnlyElement(cfg.getValidationErrors()).getMessage()) .isEqualTo( "project.config: Setting a submittability expression for submit requirement" - + " 'code-review' is required: Missing" - + " submit-requirement.code-review.submittableIf"); + + " 'Code-Review' is required: Missing" + + " submit-requirement.Code-Review.submittableIf"); } @Test @@ -953,10 +953,10 @@ tr.commit() .add( "project.config", - "[submit-requirement \"code-review\"]\n" + "[submit-requirement \"Code-Review\"]\n" + " description = At least one Code Review +2\n" + " applicableIf =branch(refs/heads/master)\n" - + " submittableIf = label(code-review, +2)\n" + + " submittableIf = label(Code-Review, +2)\n" + "[notify \"name\"]\n" + " email = example@example.com\n") .create();