Add Gradle 7.4 Aggregated Test Reports

build.gradle

@@ -50,6 +50,8 @@ plugins {
   id 'opensearch.global-build-info'
   id "com.diffplug.spotless" version "6.4.2" apply false
   id "org.gradle.test-retry" version "1.3.2" apply false
+  id "test-report-aggregation"
+  id 'jacoco-report-aggregation'
 }
 
 apply from: 'gradle/build-complete.gradle'
@@ -385,6 +387,15 @@ gradle.projectsEvaluated {
       }
     }
   }
+
+  dependencies {
+    subprojects.findAll { it.pluginManager.hasPlugin('java') }.forEach {
+      testReportAggregation it
+    }
+    subprojects.findAll { it.pluginManager.hasPlugin('jacoco') }.forEach {
+     jacocoAggregation it
+    }
+  }
 }
 
 // test retry configuration
@@ -402,6 +413,7 @@ subprojects {
 // eclipse configuration
 allprojects {
   apply plugin: 'eclipse'
+
   // Name all the non-root projects after their path so that paths get grouped together when imported into eclipse.
   if (path != ':') {
     eclipse.project.name = path
@@ -558,3 +570,15 @@ subprojects {
     }
   }
 }
+
+reporting {
+  reports {
+    testAggregateTestReport(AggregateTestReport) { 
+      testType = TestSuiteType.UNIT_TEST
+    }
+  }
+}
+
+tasks.named(JavaBasePlugin.CHECK_TASK_NAME) {
+  dependsOn tasks.named('testAggregateTestReport', TestReport) 
+}

gradle/code-coverage.gradle

@@ -10,92 +10,37 @@ apply plugin: 'jacoco'
 
 repositories {
   mavenCentral()
+  gradlePluginPortal()
 }
 
 allprojects {
   plugins.withId('jacoco') {
-    // The default JaCoCo version in Gradle 6.6.1 is 0.8.5, but at least version 0.8.6 officially supports Java 14
-    jacoco.toolVersion = '0.8.7'
+    jacoco.toolVersion = '0.8.8'
   }
 }
 
-def codeCoverageReportTask = tasks.register("codeCoverageReport", JacocoReport) {
-  description = 'Generates aggregate report from all subprojects.'
-  executionData.setFrom fileTree(dir: '.', include: '**/build/jacoco/*.exec')
-  dependsOn subprojects.findAll(s -> s.tasks.findByName('check') != null).check
-}
-
-tasks.register("codeCoverageReportForUnitTest", JacocoReport) {
-  description = 'Generates aggregate report from all subprojects for unit test.'
-  executionData.setFrom fileTree(dir: '.', include: '**/build/jacoco/test.exec')
-}
-
-tasks.register("codeCoverageReportForIntegrationTest", JacocoReport) {
-  description = 'Generates aggregate report from all subprojects for integration test.'
-  // These kinds of tests are integration test, and the tests can be ran by Gradle tasks with the same name
-  def integrationTestExecPathList = ['**/build/jacoco/integTest.exec',
-                                     '**/build/jacoco/internalClusterTest.exec',
-                                     '**/build/jacoco/javaRestTest.exec',
-                                     '**/build/jacoco/yamlRestTest.exec' ]
-  executionData.setFrom fileTree(dir: '.', include: integrationTestExecPathList)
-}
-
 tasks.withType(JacocoReport).configureEach {
   group = JavaBasePlugin.VERIFICATION_GROUP
 
-  // Select projects with corresponding tests in order to run proper tests and select proper classes to generate the report
-  def projectsWithJavaPlugin = subprojects.findAll { it.pluginManager.hasPlugin('java') }
-  def projectsWithUnitTest = projectsWithJavaPlugin.findAll { it.tasks.findByName('test').enabled }
-  def projectsWithIntegTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('integTest')}
-  def projectsWithAsyncIntegTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('asyncIntegTest')}
-  def projectsWithInternalClusterTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('internalClusterTest')}
-  def projectsWithPooledInternalClusterTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('pooledInternalClusterTest')}
-  def projectsWithJavaRestTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('javaRestTest')}
-  def projectsWithYamlRestTest = projectsWithJavaPlugin.findAll {it.tasks.findByName('yamlRestTest')}
-  def projectsWithIntegrationTest = projectsWithIntegTest + projectsWithAsyncIntegTest + projectsWithInternalClusterTest + projectsWithPooledInternalClusterTest + projectsWithJavaRestTest + projectsWithYamlRestTest
-  def projectsWithTest = projectsWithUnitTest + projectsWithIntegrationTest
-
-  def selectedProjects
-  switch (name) {
-    case "codeCoverageReportForUnitTest":
-      dependsOn projectsWithUnitTest.test
-      selectedProjects = projectsWithUnitTest
-      break
-    case "codeCoverageReportForIntegrationTest":
-      dependsOn projectsWithIntegTest.integTest
-      dependsOn projectsWithAsyncIntegTest.asyncIntegTest
-      dependsOn projectsWithInternalClusterTest.internalClusterTest
-      dependsOn projectsWithPooledInternalClusterTest.pooledInternalClusterTest
-      dependsOn projectsWithJavaRestTest.javaRestTest
-      dependsOn projectsWithYamlRestTest.yamlRestTest
-      selectedProjects = projectsWithIntegrationTest
-      break
-    default:
-      dependsOn projectsWithUnitTest.test
-      dependsOn projectsWithIntegTest.integTest
-      dependsOn projectsWithAsyncIntegTest.asyncIntegTest
-      dependsOn projectsWithInternalClusterTest.internalClusterTest
-      dependsOn projectsWithPooledInternalClusterTest.pooledInternalClusterTest
-      dependsOn projectsWithJavaRestTest.javaRestTest
-      dependsOn projectsWithYamlRestTest.yamlRestTest
-      selectedProjects = projectsWithJavaPlugin
-      break
-  }
-
-  sourceDirectories.setFrom files(selectedProjects.sourceSets.main.allSource.srcDirs)
-  classDirectories.setFrom files(selectedProjects.sourceSets.main.output)
-
   reports {
     // Code coverage report in HTML and CSV formats are on demand, in case they take extra disk space.
-    xml.getRequired().set(System.getProperty('tests.coverage.report.xml', 'true').toBoolean())
-    html.getRequired().set(System.getProperty('tests.coverage.report.html', 'false').toBoolean())
-    csv.getRequired().set(System.getProperty('tests.coverage.report.csv', 'false').toBoolean())
+    xml.required = System.getProperty('tests.coverage.report.xml', 'true').toBoolean()
+    html.required = System.getProperty('tests.coverage.report.html', 'false').toBoolean()
+    csv.required = System.getProperty('tests.coverage.report.csv', 'false').toBoolean()
   }
 }
 
 if (System.getProperty("tests.coverage")) {
+  reporting {
+    reports {
+      testCodeCoverageReport(JacocoCoverageReport) { 
+        testType = TestSuiteType.UNIT_TEST
+      }
+    }
+  }
+
   // Attach code coverage report task to Gradle check task
   project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure {
-    dependsOn codeCoverageReportTask
+    dependsOn tasks.named('testCodeCoverageReport', JacocoReport) 
   }
 }