Project Code Coverage

Signed-off-by: Prudhvi Godithi <[email protected]>

Author: prudhvigodithi

TESTING.md

@@ -522,15 +522,12 @@ The code coverage report can be generated through Gradle with [JaCoCo plugin](ht
 
 For unit test:
 
-    ./gradlew codeCoverageReportForUnitTest
+    ./gradlew jacocoTestReport
 
 For integration test:
 
-    ./gradlew codeCoverageReportForIntegrationTest
+    ./gradlew :server:jacocoTestReport
 
-For the combined tests (unit and integration):
-
-    ./gradlew codeCoverageReport
 
 To generate coverage report for the combined tests after `check` task:
 
@@ -546,7 +543,7 @@ The report will be in XML format only by default, but you can add the following
 
 For example, to generate code coverage report in HTML format and not in XML format:
 
-    ./gradlew codeCoverageReport -Dtests.coverage.report.html=true -Dtests.coverage.report.xml=false
+    ./gradlew jacocoTestReport -Dtests.coverage.report.html=true -Dtests.coverage.report.xml=false
 
 Apart from using Gradle, it is also possible to gain insight in code coverage using IntelliJ’s built-in coverage analysis tool that can measure coverage upon executing specific tests. Eclipse may also be able to do the same using the EclEmma plugin.
 

gradle/code-coverage.gradle

@@ -34,6 +34,47 @@ tasks.withType(JacocoReport).configureEach {
   }
 }
 
+// Enhance jacoco report tasks to include all test types
+allprojects {
+  plugins.withId('jacoco') {
+    // Configure both jacocoTestReport and testCodeCoverageReport tasks
+    tasks.matching { it.name == 'jacocoTestReport' || it.name == 'testCodeCoverageReport' }.configureEach {
+      // Collect execution data files from all available test tasks
+      def executionDataFiles = []
+      def sourceSetsList = []
+      
+      if (tasks.findByName('test')) {
+        executionDataFiles.add("$buildDir/jacoco/test.exec")
+        sourceSetsList.add(sourceSets.test)
+      }
+
+      if (tasks.findByName('internalClusterTest')) {
+        executionDataFiles.add("$buildDir/jacoco/internalClusterTest.exec")
+        sourceSetsList.add(sourceSets.internalClusterTest)
+      }
+
+      if (tasks.findByName('javaRestTest')) {
+        executionDataFiles.add("$buildDir/jacoco/javaRestTest.exec")
+        sourceSetsList.add(sourceSets.javaRestTest)
+      }
+      
+      // Set execution data and source sets
+      if (!executionDataFiles.isEmpty()) {
+        executionData.setFrom(files(executionDataFiles).filter { it.exists() })
+        sourceSets(*sourceSetsList)
+      }
+
+      // Only run if at least one execution data file exists
+      onlyIf {
+        file("$buildDir/jacoco/test.exec").exists() ||
+          file("$buildDir/jacoco/internalClusterTest.exec").exists() ||
+          file("$buildDir/jacoco/javaRestTest.exec").exists()
+      }
+    }
+  }
+}
+
+
 if (System.getProperty("tests.coverage")) {
   reporting {
     reports {