Merge "CodeOwnerSubmitRule: Export the rule name"
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java
index 32c0d58..ec53945 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRule.java
@@ -42,6 +42,7 @@
@Singleton
class CodeOwnerSubmitRule implements SubmitRule {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+ public static final String RULE_NAME = "Code-Owners";
public static class CodeOwnerSubmitRuleModule extends AbstractModule {
@Override
@@ -53,10 +54,7 @@
}
private static final LegacySubmitRequirement SUBMIT_REQUIREMENT =
- LegacySubmitRequirement.builder()
- .setFallbackText("Code Owners")
- .setType("code-owners")
- .build();
+ LegacySubmitRequirement.builder().setFallbackText(RULE_NAME).setType("code-owners").build();
private final CodeOwnersPluginConfiguration codeOwnersPluginConfiguration;
private final CodeOwnerApprovalCheck codeOwnerApprovalCheck;
@@ -173,6 +171,7 @@
SubmitRecord submitRecord = new SubmitRecord();
submitRecord.status = SubmitRecord.Status.OK;
submitRecord.requirements = ImmutableList.of(SUBMIT_REQUIREMENT);
+ submitRecord.ruleName = RULE_NAME;
return submitRecord;
}
@@ -180,6 +179,7 @@
SubmitRecord submitRecord = new SubmitRecord();
submitRecord.status = SubmitRecord.Status.NOT_READY;
submitRecord.requirements = ImmutableList.of(SUBMIT_REQUIREMENT);
+ submitRecord.ruleName = RULE_NAME;
return submitRecord;
}
@@ -187,6 +187,7 @@
SubmitRecord submitRecord = new SubmitRecord();
submitRecord.errorMessage = reason;
submitRecord.status = SubmitRecord.Status.RULE_ERROR;
+ submitRecord.ruleName = RULE_NAME;
return submitRecord;
}
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
index b08de44..22cc758 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
@@ -125,7 +125,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("NOT_READY");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Try to submit the change.
@@ -137,8 +137,7 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: submit requirement 'code-owners~CodeOwnerSubmitRule' is"
- + " unsatisfied.",
+ + "Change %d: submit requirement 'Code-Owners' is unsatisfied.",
changeInfo._number));
}
@@ -179,7 +178,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("NOT_READY");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Try to submit the change.
@@ -191,8 +190,7 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: submit requirement 'code-owners~CodeOwnerSubmitRule' is"
- + " unsatisfied.",
+ + "Change %d: submit requirement 'Code-Owners' is unsatisfied.",
changeInfo._number));
}
@@ -230,7 +228,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
@@ -270,7 +268,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(gApi.changes().id(changeId).get().requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
@@ -307,7 +305,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("NOT_READY");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Try to submit the change.
@@ -350,7 +348,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
@@ -406,7 +404,7 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %s: submit requirement 'code-owners~CodeOwnerSubmitRule' has an"
+ + "Change %s: submit requirement 'Code-Owners' has an"
+ " error: Submittability expression result has an error:"
+ " Failed to evaluate code owner statuses for"
+ " patch set 1 of change %s (cause: invalid code owner config file '%s'"
@@ -460,7 +458,7 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %s: submit requirement 'code-owners~CodeOwnerSubmitRule' has an"
+ + "Change %s: submit requirement 'Code-Owners' has an"
+ " error: Submittability expression result has an error:"
+ " Failed to evaluate code owner statuses for"
+ " patch set 1 of change %s (cause: invalid code owner config file '%s'"
@@ -488,7 +486,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
@@ -532,7 +530,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
@@ -616,7 +614,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Submit the change.
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/batch/CodeOwnerSubmitRuleBatchIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/batch/CodeOwnerSubmitRuleBatchIT.java
index 3890cc8..8b51740 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/batch/CodeOwnerSubmitRuleBatchIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/batch/CodeOwnerSubmitRuleBatchIT.java
@@ -73,7 +73,7 @@
LegacySubmitRequirementInfoSubject submitRequirementInfoSubject =
assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("NOT_READY");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
// Approve by a code owner.
@@ -87,7 +87,7 @@
// Check the submit requirement.
submitRequirementInfoSubject = assertThatCollection(changeInfo.requirements).onlyElement();
submitRequirementInfoSubject.hasStatusThat().isEqualTo("OK");
- submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementInfoSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
submitRequirementInfoSubject.hasTypeThat().isEqualTo("code-owners");
}
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRuleTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRuleTest.java
index a06db05..a2470e6 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRuleTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/CodeOwnerSubmitRuleTest.java
@@ -93,7 +93,7 @@
LegacySubmitRequirementSubject submitRequirementSubject =
submitRecordSubject.hasSubmitRequirementsThat().onlyElement();
submitRequirementSubject.hasTypeThat().isEqualTo("code-owners");
- submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
}
@Test
@@ -119,7 +119,7 @@
LegacySubmitRequirementSubject submitRequirementSubject =
submitRecordSubject.hasSubmitRequirementsThat().onlyElement();
submitRequirementSubject.hasTypeThat().isEqualTo("code-owners");
- submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
}
@Test
@@ -228,6 +228,6 @@
LegacySubmitRequirementSubject submitRequirementSubject =
submitRecordSubject.hasSubmitRequirementsThat().onlyElement();
submitRequirementSubject.hasTypeThat().isEqualTo("code-owners");
- submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code Owners");
+ submitRequirementSubject.hasFallbackTextThat().isEqualTo("Code-Owners");
}
}
