From f2cf40f43d41dc0e318f34867dca38a87258ed88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= Date: Mon, 31 Jan 2022 11:32:37 +0100 Subject: [PATCH] Indicates to Gerrit that the review is posted by an automated system --- .../sonargerrit/gerrit/GerritReviewBuilder.java | 1 + .../{CommentTypeTest.java => ReviewTest.java} | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) rename src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/{CommentTypeTest.java => ReviewTest.java} (93%) diff --git a/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritReviewBuilder.java b/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritReviewBuilder.java index eabd1bf7..c251add5 100644 --- a/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritReviewBuilder.java +++ b/src/main/java/org/jenkinsci/plugins/sonargerrit/gerrit/GerritReviewBuilder.java @@ -46,6 +46,7 @@ public ReviewInput buildReview() { // review String reviewMessage = getReviewMessage(finalIssuesToComment); ReviewInput reviewInput = new ReviewInput().message(reviewMessage); + reviewInput.tag = "autogenerated:sonar"; switch (reviewConfig.getCommentType()) { case STANDARD: diff --git a/src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/CommentTypeTest.java b/src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/ReviewTest.java similarity index 93% rename from src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/CommentTypeTest.java rename to src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/ReviewTest.java index 29e4482d..bf6adc0d 100644 --- a/src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/CommentTypeTest.java +++ b/src/test/java/org/jenkinsci/plugins/sonargerrit/gerrit/ReviewTest.java @@ -31,7 +31,7 @@ /** @author RĂ©da Housni Alaoui */ @EnableCluster -class CommentTypeTest { +class ReviewTest { private static final String MAVEN_TARGET = "clean verify sonar:sonar " @@ -45,7 +45,7 @@ class CommentTypeTest { @BeforeAll static void beforeAll(Cluster cluster, @TempDir Path workTree) throws Exception { - CommentTypeTest.cluster = cluster; + ReviewTest.cluster = cluster; git = GerritGit.createAndCloneRepository(cluster.gerrit(), workTree); @@ -122,6 +122,19 @@ void test2() throws Exception { }); } + @Test + @DisplayName("Review tag is autogenerated:sonar") + void test3() throws Exception { + GerritChange change = createChangeViolatingS1186(); + triggerAndAssertSuccess(createPipelineJob(change, ReviewCommentType.STANDARD)); + + ChangeInfo changeDetail = change.getDetail(); + assertThat(changeDetail.labels.get(GerritServer.CODE_QUALITY_LABEL).all) + .hasSize(1) + .map(approvalInfo -> approvalInfo.tag) + .containsExactly("autogenerated:sonar"); + } + private GerritChange createChangeViolatingS1186() throws GitAPIException, IOException, RestApiException { git.addAndCommitFile(