fix(archunitsonar): Fix UpgradeAction for jacoco merged report adding…

… arch unit issues to sonar
bancolombia · Sep 19, 2024 · 711ad65 · 711ad65
1 parent c73c3fc
commit 711ad65
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 5 deletions.
diff --git a/src/main/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2023M10D02SonarRules.java b/src/main/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2023M10D02SonarRules.java
@@ -1,6 +1,7 @@
 package co.com.bancolombia.factory.upgrades.actions;
 
 import co.com.bancolombia.Constants;
+import co.com.bancolombia.exceptions.InvalidStateException;
 import co.com.bancolombia.factory.ModuleBuilder;
 import co.com.bancolombia.factory.upgrades.UpdateUtils;
 import co.com.bancolombia.factory.upgrades.UpgradeAction;
@@ -11,15 +12,22 @@ public class UpgradeY2023M10D02SonarRules implements UpgradeAction {
       "\n" + "        property \"sonar.externalIssuesReportPaths\", \"build/issues.json\"";
   public static final String ISSUES_JSON = "issues.json";
   public static final String JACOCO_TEST_REPORT_XML = "jacocoTestReport.xml\"";
+  public static final String JACOCO_MERGED_REPORT_XML = "jacocoMergedReport.xml\"";
 
   @Override
   @SneakyThrows
   public boolean up(ModuleBuilder builder) {
-    return builder.updateFile(
-        Constants.MainFiles.BUILD_GRADLE,
-        content ->
-            UpdateUtils.insertAfterMatch(
-                content, JACOCO_TEST_REPORT_XML, ISSUES_JSON, CONCAT_VALUE));
+    return builder.updateFile(Constants.MainFiles.BUILD_GRADLE, this::insert);
+  }
+
+  private String insert(String content) {
+    try {
+      return UpdateUtils.insertAfterMatch(
+          content, JACOCO_TEST_REPORT_XML, ISSUES_JSON, CONCAT_VALUE);
+    } catch (InvalidStateException ignored) {
+      return UpdateUtils.insertAfterMatch(
+          content, JACOCO_MERGED_REPORT_XML, ISSUES_JSON, CONCAT_VALUE);
+    }
   }
 
   @Override

diff --git a/...st/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2023M10D02SonarRulesTest.java b/...st/java/co/com/bancolombia/factory/upgrades/actions/UpgradeY2023M10D02SonarRulesTest.java
@@ -54,4 +54,19 @@ void shouldApplyUpdate() throws IOException {
     assertTrue(applied);
     verify(builder, times(1)).addFile(file, expectedText);
   }
+
+  @Test
+  void shouldApplyUpdateWhenMergedReport() throws IOException {
+    String file = Constants.MainFiles.BUILD_GRADLE;
+    // Arrange
+    DefaultResolver resolver = new DefaultResolver();
+    String text = FileUtils.getResourceAsString(resolver, "sonar-rules/before-merged.txt");
+    String expectedText = FileUtils.getResourceAsString(resolver, "sonar-rules/after-merged.txt");
+    builder.addFile(file, text);
+    // Act
+    boolean applied = updater.up(builder);
+    // Assert
+    assertTrue(applied);
+    verify(builder, times(1)).addFile(file, expectedText);
+  }
 }
diff --git a/src/test/resources/sonar-rules/after-merged.txt b/src/test/resources/sonar-rules/after-merged.txt
@@ -0,0 +1,35 @@
+buildscript {
+	ext {
+		cleanArchitectureVersion = '3.6.1'
+		springBootVersion = '3.1.1'
+		sonarVersion = '4.2.1.3168'
+		jacocoVersion = '0.8.10'
+        lombokVersion = '1.18.28'
+	}
+}
+
+plugins {
+	id 'co.com.bancolombia.cleanArchitecture' version "${cleanArchitectureVersion}"
+	id 'org.springframework.boot' version "${springBootVersion}" apply false
+	id 'org.sonarqube' version "${sonarVersion}"
+	id 'jacoco'
+}
+apply plugin: 'co.com.bancolombia.cleanArchitecture'
+
+sonarqube {
+    def modules = subprojects.projectDir.collect { "${it.toString().replace(project.projectDir.toString() + "/", "")}" }
+    properties {
+        property "sonar.sourceEnconding", "UTF-8"
+        property "sonar.modules", "${modules.join(',')}"
+        property "sonar.sources", "src,deployment,settings.gradle,main.gradle,build.gradle,${modules.collect { "${it}/build.gradle" }.join(',')}"
+        property "sonar.exclusions","**/MainApplication.java"
+        property "sonar.test", "src/test"
+        property "sonar.java.binaries", ""
+        property "sonar.junit.reportsPath", ""
+        property "sonar.java.coveragePlugin", "jacoco"
+        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacocoMergedReport/jacocoMergedReport.xml"
+        property "sonar.externalIssuesReportPaths", "build/issues.json"
+    }
+}
+
+apply from: './main.gradle'
diff --git a/src/test/resources/sonar-rules/before-merged.txt b/src/test/resources/sonar-rules/before-merged.txt
@@ -0,0 +1,34 @@
+buildscript {
+	ext {
+		cleanArchitectureVersion = '3.6.1'
+		springBootVersion = '3.1.1'
+		sonarVersion = '4.2.1.3168'
+		jacocoVersion = '0.8.10'
+        lombokVersion = '1.18.28'
+	}
+}
+
+plugins {
+	id 'co.com.bancolombia.cleanArchitecture' version "${cleanArchitectureVersion}"
+	id 'org.springframework.boot' version "${springBootVersion}" apply false
+	id 'org.sonarqube' version "${sonarVersion}"
+	id 'jacoco'
+}
+apply plugin: 'co.com.bancolombia.cleanArchitecture'
+
+sonarqube {
+    def modules = subprojects.projectDir.collect { "${it.toString().replace(project.projectDir.toString() + "/", "")}" }
+    properties {
+        property "sonar.sourceEnconding", "UTF-8"
+        property "sonar.modules", "${modules.join(',')}"
+        property "sonar.sources", "src,deployment,settings.gradle,main.gradle,build.gradle,${modules.collect { "${it}/build.gradle" }.join(',')}"
+        property "sonar.exclusions","**/MainApplication.java"
+        property "sonar.test", "src/test"
+        property "sonar.java.binaries", ""
+        property "sonar.junit.reportsPath", ""
+        property "sonar.java.coveragePlugin", "jacoco"
+        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacocoMergedReport/jacocoMergedReport.xml"
+    }
+}
+
+apply from: './main.gradle'