Remove API-Review footer linev3.7-based

New API-Review label will be added to help identifying changes
needing API review. In first phase the label is non-blocking
and for information only, so it doesn't make sense to display
it in commit footer. If later the label is changed to blocking,
it might make sense to revert this change.

Change-Id: Ib7120088c995920d7e2b2ac54f70a8a21296bee1
Reviewed-by: Daniel Smith <[email protected]>

2 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java
index 2b84045..cc72240 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2019-22 The Qt Company
+// Copyright (C) 2019-23 The Qt Company
 //
 
 package com.googlesource.gerrit.plugins.qtcodereview;
@@ -38,6 +38,7 @@ public class QtChangeMessageModifier implements ChangeMessageModifier {
       if (((!line.startsWith("Reviewed-on: ") || showReviewedOn == true)
               && !line.startsWith("Tested-by: ")
               && !line.startsWith("Sanity-Review: ")
+              && !line.startsWith("API-Review: ")
               && !line.startsWith("ChangeLog: "))
           || first_line) {
         stringBuilder.append(line).append("\n");
diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java
index cb68fac..4b5ccb6 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommitFooterIT.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-21 The Qt Company
+// Copyright (C) 2019-23 The Qt Company
 
 package com.googlesource.gerrit.plugins.qtcodereview;
 
@@ -48,12 +48,15 @@ public class QtCommitFooterIT extends QtCodeReviewIT {
   public void removeCommitFooterLines() throws Exception {
     LabelType sanity =
         label("Sanity-Review", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
+    LabelType apireview =
+        label("API-Review", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"), value(-2, "Block"));
     LabelType verified =
         label("Verified", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
     LabelType changelog =
         label("ChangeLog", value(1, "Passes"), value(0, "No score"), value(-1, "Failed"));
     try (ProjectConfigUpdate u = updateProject(project)) {
       u.getConfig().getLabelSections().put(sanity.getName(), sanity);
+      u.getConfig().getLabelSections().put(apireview.getName(), apireview);
       u.getConfig().getLabelSections().put(verified.getName(), verified);
       u.getConfig().getLabelSections().put(changelog.getName(), changelog);
       u.save();
@@ -65,6 +68,7 @@ public class QtCommitFooterIT extends QtCodeReviewIT {
         .project(project)
         .forUpdate()
         .add(allowLabel(sanity.getName()).ref(heads).group(registered).range(-1, 1))
+        .add(allowLabel(apireview.getName()).ref(heads).group(registered).range(-2, 1))
         .add(
             allowLabel(TestLabels.codeReview().getName()).ref(heads).group(registered).range(-2, 2))
         .add(allowLabel(verified.getName()).ref(heads).group(registered).range(-1, 1))
@@ -81,6 +85,7 @@ public class QtCommitFooterIT extends QtCodeReviewIT {
     input.label("Code-Review", 2);
     input.label(verified.getName(), 1);
     input.label(sanity.getName(), 1);
+    input.label(apireview.getName(), 1);
     input.label(changelog.getName(), 1);
     gApi.changes().id(change.getChangeId()).current().review(input);
 
@@ -95,6 +100,7 @@ public class QtCommitFooterIT extends QtCodeReviewIT {
     assertThat(splitCommit[1]).contains("Reviewed-by");
     assertThat(splitCommit[1]).doesNotContain("Reviewed-on");
     assertThat(splitCommit[1]).doesNotContain("Sanity-Review");
+    assertThat(splitCommit[1]).doesNotContain("API-Review");
     assertThat(splitCommit[1]).doesNotContain("Tested-by");
     assertThat(splitCommit[1]).doesNotContain("ChangeLog");
   }