Trying to find the coverage path with regex pattern as they mismatch

Pushing it to see it through CI as local wsl seems broke and runs forever
oppia · Jul 29, 2024 · c1f012c · c1f012c
1 parent 8e88c35
commit c1f012c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 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
@@ -1,6 +1,5 @@
 package org.oppia.android.scripts.coverage
 
-import kotlinx.coroutines.CoroutineScope
 import org.oppia.android.scripts.common.BazelClient
 import org.oppia.android.scripts.common.CommandExecutor
 import org.oppia.android.scripts.common.ScriptBackgroundCoroutineDispatcher
@@ -35,10 +34,10 @@ class CoverageRunner(
   fun runCoverageForTestTarget(
     bazelTestTarget: String
   ): CoverageReport {
-      val coverageResult = retrieveCoverageResult(bazelTestTarget)
-        ?: error("Failed to retrieve coverage result for $bazelTestTarget")
+    val coverageResult = retrieveCoverageResult(bazelTestTarget)
+      ?: error("Failed to retrieve coverage result for $bazelTestTarget")
 
-      return coverageDataFileLines(coverageResult, bazelTestTarget)
+    return coverageDataFileLines(coverageResult, bazelTestTarget)
   }
 
   private fun retrieveCoverageResult(

diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel b/scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel
@@ -8,7 +8,7 @@ kt_jvm_test(
     name = "RunCoverageTest",
     size = "large",
     srcs = ["RunCoverageTest.kt"],
-    shard_count = 4,
+    shard_count = 24,
     deps = [
         "//scripts:test_file_check_assets",
         "//scripts/src/java/org/oppia/android/scripts/coverage:run_coverage_lib",

diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageRunnerTest.kt b/scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageRunnerTest.kt
@@ -104,8 +104,9 @@ class CoverageRunnerTest {
 
   @Test
   fun testRunCoverageForTestTarget_coverageRetrievalFailed_throwsException() {
-    val coverageFilePath = "${tempFolder.root}/bazel-out/k8-fastbuild/testlogs" +
-      "/coverage/test/java/com/example/AddNumsTest/coverage.dat"
+//    val coverageFilePath = "${tempFolder.root.absolutePath}/bazel-out/k8-fastbuild/testlogs" +
+//      "/coverage/test/java/com/example/AddNumsTest/coverage.dat"
+    val pattern = Regex(".*bazel-out/k8-fastbuild/testlogs/coverage/test/java/com/example/AddNumsTest/coverage.dat")
 
     testBazelWorkspace.initEmptyWorkspace()
     testBazelWorkspace.addSourceAndTestFileWithContent(
@@ -125,10 +126,23 @@ class CoverageRunnerTest {
 
         launch {
           do {
-            File(coverageFilePath).takeIf { it.exists() }?.apply {
+            val files = File(tempFolder.root.absolutePath).listFiles() ?: emptyArray()
+            val matchingFiles = files.filter { file ->
+              pattern.matches(file.absolutePath)
+            }
+
+            if (matchingFiles.isNotEmpty()) {
+              for (file in matchingFiles) {
+                file.writeText("")
+                println("Processed: ${file.absolutePath}")
+                return@launch
+              }
+            }
+
+            /*File(coverageFilePath).takeIf { it.exists() }?.apply {
               writeText("")
               return@launch
-            }
+            }*/
             delay(1)
           } while (true)
         }