Tweak aggregated reports setup

Author: jjohannes

gradle/plugins/src/main/kotlin/org.example.gradle.feature.test-end-to-end.gradle.kts

@@ -9,6 +9,7 @@ tasks.named("mockApiJar") { group = null }
 
 // end-to-end tests
 testing.suites.create<JvmTestSuite>("testEndToEnd") {
+    testType = TestSuiteType.FUNCTIONAL_TEST
     targets.named("testEndToEnd") {
         testTask {
             group = "build"

gradle/plugins/src/main/kotlin/org.example.gradle.report.code-coverage.gradle.kts

@@ -5,9 +5,33 @@ plugins {
     id("org.example.gradle.base.lifecycle")
 }
 
+// Make aggregation "classpath" use the platform for versions (gradle/versions)
 configurations.aggregateCodeCoverageReportResults { extendsFrom(configurations["internal"]) }
 
-tasks.check {
-    // Generate report when running 'check'
-    dependsOn(tasks.testCodeCoverageReport)
+// Integrate FUNCTIONAL_TEST results into the aggregated UNIT_TEST coverage results
+tasks.testCodeCoverageReport {
+    reports.html.outputLocation = layout.buildDirectory.dir("reports/coverage")
+    reports.xml.outputLocation = layout.buildDirectory.file("reports/coverage.xml")
+    executionData.from(
+        configurations.aggregateCodeCoverageReportResults
+            .get()
+            .incoming
+            .artifactView {
+                withVariantReselection()
+                attributes {
+                    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.VERIFICATION))
+                    attribute(TestSuiteType.TEST_SUITE_TYPE_ATTRIBUTE, objects.named(TestSuiteType.FUNCTIONAL_TEST))
+                    attribute(TestSuiteTargetName.TEST_SUITE_TARGET_NAME_ATTRIBUTE, objects.named("testEndToEnd"))
+                    attribute(
+                        VerificationType.VERIFICATION_TYPE_ATTRIBUTE,
+                        objects.named(VerificationType.JACOCO_RESULTS)
+                    )
+                    attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.BINARY_DATA_TYPE)
+                }
+            }
+            .files
+    )
 }
+
+// Generate report when running 'check'
+tasks.check { dependsOn(tasks.testCodeCoverageReport) }

gradle/plugins/src/main/kotlin/org.example.gradle.report.test.gradle.kts

@@ -5,13 +5,35 @@ plugins {
     id("org.example.gradle.base.lifecycle")
 }
 
+// Make aggregation "classpath" use the platform for versions (gradle/versions)
 configurations.aggregateTestReportResults { extendsFrom(configurations["internal"]) }
 
-tasks.check {
-    // Generate report when running 'check'
-    dependsOn(tasks.testAggregateTestReport)
+// Integrate FUNCTIONAL_TEST results into the aggregated UNIT_TEST test results
+tasks.testAggregateTestReport {
+    destinationDirectory = layout.buildDirectory.dir("reports/tests")
+    testResults.from(
+        configurations.aggregateTestReportResults
+            .get()
+            .incoming
+            .artifactView {
+                withVariantReselection()
+                attributes {
+                    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.VERIFICATION))
+                    attribute(TestSuiteType.TEST_SUITE_TYPE_ATTRIBUTE, objects.named(TestSuiteType.FUNCTIONAL_TEST))
+                    attribute(TestSuiteTargetName.TEST_SUITE_TARGET_NAME_ATTRIBUTE, objects.named("testEndToEnd"))
+                    attribute(
+                        VerificationType.VERIFICATION_TYPE_ATTRIBUTE,
+                        objects.named(VerificationType.TEST_RESULTS)
+                    )
+                }
+            }
+            .files
+    )
 }
 
+// Generate report when running 'check'
+tasks.check { dependsOn(tasks.testAggregateTestReport) }
+
 // Clear tasks group 'build' from clutter for a clean set of tasks to be used in daily work
 tasks.buildDependents { setGroup(null) }