Include coverage data to proto for any related tests - LocalTest and …

…return as a list of CoverageReport
oppia · Jun 21, 2024 · 46cc3ff · 46cc3ff
1 parent 653ec68
commit 46cc3ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt b/scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt
@@ -38,16 +38,14 @@ class CoverageRunner(
    */
   fun runWithCoverageAsync(
     bazelTestTarget: String
-  ): Deferred<List<String>?> {
+  ): Deferred<CoverageReport?> {
     return CoroutineScope(scriptBgDispatcher).async {
-      val coverageDataFilePath = retrieveCoverageResult(bazelTestTarget)
+      val coverageResult = retrieveCoverageResult(bazelTestTarget)
 
-      val coverageReport = coverageDataFilePath?.let {
+      val coverageReport = coverageResult?.let {
         parseCoverageData(it, bazelTestTarget)
       }
-      println("Coverage Report: $coverageReport")
-
-      coverageDataFilePath
+      coverageReport
     }
   }
 

diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
@@ -4,6 +4,7 @@ import org.oppia.android.scripts.common.BazelClient
 import org.oppia.android.scripts.common.CommandExecutor
 import org.oppia.android.scripts.common.CommandExecutorImpl
 import org.oppia.android.scripts.common.ScriptBackgroundCoroutineDispatcher
+import org.oppia.android.scripts.proto.CoverageReport
 import org.oppia.android.scripts.proto.TestFileExemptions
 import java.io.File
 import java.io.FileInputStream
@@ -71,8 +72,8 @@ class RunCoverage(
    * a Bazel client, finds potential test file paths, retrieves Bazel targets, and initiates
    * coverage analysis for each test target found.
    */
-  fun execute(): MutableList<List<String>> {
-    var coverageDataList = mutableListOf<List<String>>()
+  fun execute(): MutableList<CoverageReport> {
+    var coverageDataList = mutableListOf<CoverageReport>()
     val testFileExemptionList = loadTestFileExemptionsProto(testFileExemptionTextProto)
       .getExemptedFilePathList()
 
@@ -85,6 +86,11 @@ class RunCoverage(
     val testFilePaths = findTestFile(repoRoot, filePath)
     val testTargets = bazelClient.retrieveBazelTargets(testFilePaths)
 
+    /*val testResults = listOf(
+      "//utility/src/test/java/org/oppia/android/util/parser/math:MathModelTest",
+      "//utility/src/test/java/org/oppia/android/util/math:FloatExtensionsTest")*/
+
+//    for (testTarget in testResults) {
     for (testTarget in testTargets) {
       val coverageData = RunCoverageForTestTarget(
         rootDirectory,

diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverageForTestTarget.kt b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverageForTestTarget.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.runBlocking
 import org.oppia.android.scripts.common.CommandExecutor
 import org.oppia.android.scripts.common.CommandExecutorImpl
 import org.oppia.android.scripts.common.ScriptBackgroundCoroutineDispatcher
+import org.oppia.android.scripts.proto.CoverageReport
 import java.io.File
 import java.util.concurrent.TimeUnit
 
@@ -65,7 +66,7 @@ class RunCoverageForTestTarget(
   /**
    * Analyzes target file for coverage, generates chosen reports accordingly.
    */
-  fun runCoverage(): List<String>? {
+  fun runCoverage(): CoverageReport? {
     return runWithCoverageAnalysis()
   }
 
@@ -74,7 +75,7 @@ class RunCoverageForTestTarget(
    *
    * @return the generated coverage data
    */
-  fun runWithCoverageAnalysis(): List<String>? {
+  fun runWithCoverageAnalysis(): CoverageReport? {
     return runBlocking {
       val result =
         CoverageRunner(repoRoot, scriptBgDispatcher, commandExecutor)