Merge branch 'develop' into add_checks_feature_flag_checks

scripts/src/java/org/oppia/android/scripts/coverage/CoverageRunner.kt

@@ -60,12 +60,13 @@ class CoverageRunner(
     val sfStartIdx = coverageData.indexOfFirst {
       it.startsWith("SF:") && it.substringAfter("SF:").substringAfterLast("/") == extractedFileName
     }
-    if (sfStartIdx == -1) throw IllegalArgumentException("File not found")
+    require(sfStartIdx != -1) {
+      "Coverage data not found for the file: $extractedFileName"
+    }
     val eofIdx = coverageData.subList(sfStartIdx, coverageData.size).indexOfFirst {
       it.startsWith("end_of_record")
     }
-    if (eofIdx == -1) throw IllegalArgumentException("End of record not found")
-
+    require(eofIdx != -1) { "End of record not found" }
     val fileSpecificCovDatLines = coverageData.subList(sfStartIdx, sfStartIdx + eofIdx + 1)
 
     val coverageDataProps = fileSpecificCovDatLines.groupBy { line ->
@@ -77,7 +78,7 @@ class CoverageRunner(
     }
 
     val filePath = coverageDataProps["SF"]?.firstOrNull()?.get(0)
-      ?: throw IllegalArgumentException("File path not found")
+    requireNotNull(filePath) { "File path not found" }
 
     val linesFound = coverageDataProps["LF"]?.singleOrNull()?.single()?.toInt() ?: 0
     val linesHit = coverageDataProps["LH"]?.singleOrNull()?.single()?.toInt() ?: 0

scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt

@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
  *
  * Example:
  *     bazel run //scripts:run_coverage -- $(pwd)
- *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt HTML
+ *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt format=HTML
  * Example with custom process timeout:
  *     bazel run //scripts:run_coverage -- $(pwd)
  *     utility/src/main/java/org/oppia/android/util/parser/math/MathModel.kt processTimeout=10
@@ -33,10 +33,14 @@ import java.util.concurrent.TimeUnit
 fun main(vararg args: String) {
   val repoRoot = args[0]
   val filePath = args[1]
-  val format = args.getOrNull(2)
-  val reportFormat = when {
-    format.equals("HTML", ignoreCase = true) -> ReportFormat.HTML
-    format.equals("MARKDOWN", ignoreCase = true) || format == null -> ReportFormat.MARKDOWN
+
+  val format = args.find { it.startsWith("format=", ignoreCase = true) }
+    ?.substringAfter("=")
+    ?.uppercase() ?: "MARKDOWN"
+
+  val reportFormat = when (format) {
+    "HTML" -> ReportFormat.HTML
+    "MARKDOWN" -> ReportFormat.MARKDOWN
     else -> throw IllegalArgumentException("Unsupported report format: $format")
   }
 
@@ -98,14 +102,15 @@ class RunCoverage(
    * @return a list of lists containing coverage data for each requested test target, if
    *     the file is exempted from having a test file, an empty list is returned
    */
-  fun execute(): String {
+  fun execute() {
     val testFileExemptionList = loadTestFileExemptionsProto(testFileExemptionTextProto)
       .testFileExemptionList
       .filter { it.testFileNotRequired }
       .map { it.exemptedFilePath }
 
     if (filePath in testFileExemptionList) {
-      return "This file is exempted from having a test file; skipping coverage check."
+      println("This file is exempted from having a test file; skipping coverage check.")
+      return
     }
 
     val testFilePaths = findTestFile(repoRoot, filePath)
@@ -133,8 +138,6 @@ class RunCoverage(
         println("\nGenerated report at: $reportOutputPath\n")
       }
     } ?: println("No coverage reports generated.")
-
-    return reportOutputPath
   }
 
   private fun runCoverageForTarget(testTarget: String): CoverageReport {

scripts/src/java/org/oppia/android/scripts/testing/TestBazelWorkspace.kt

@@ -30,7 +30,14 @@ class TestBazelWorkspace(private val temporaryRootFolder: TemporaryFolder) {
     temporaryRootFolder.newFile(".bazelversion").also { it.writeText(BAZEL_VERSION) }
   }
   private val bazelRcFile by lazy {
-    temporaryRootFolder.newFile(".bazelrc").also { it.writeText("--noenable_bzlmod") }
+    temporaryRootFolder.newFile(".bazelrc").also {
+      it.writeText(
+        """
+          --noenable_bzlmod
+          build --java_runtime_version=remotejdk_11 --tool_java_runtime_version=remotejdk_11
+        """.trimIndent()
+      )
+    }
   }
 
   private val testFileMap = mutableMapOf<String, File>()

scripts/src/javatests/org/oppia/android/scripts/coverage/BUILD.bazel

@@ -6,7 +6,9 @@ load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
 
 kt_jvm_test(
     name = "RunCoverageTest",
+    size = "large",
     srcs = ["RunCoverageTest.kt"],
+    shard_count = 4,
     deps = [
         "//scripts:test_file_check_assets",
         "//scripts/src/java/org/oppia/android/scripts/coverage:run_coverage_lib",

scripts/src/javatests/org/oppia/android/scripts/coverage/CoverageReporterTest.kt

@@ -71,7 +71,7 @@ class CoverageReporterTest {
   }
 
   @Test
-  fun testCoverageReporter_generateHTMLReport_hasCorrectContentAndFormatting() {
+  fun testCoverageReporter_generateHtmlReport_hasCorrectContentAndFormatting() {
     val sourceFile = tempFolder.newFile("SampleFile.kt")
     sourceFile.writeText(
       """
@@ -95,7 +95,7 @@ class CoverageReporterTest {
     )
     val (_, reportText) = reporter.generateRichTextReport()
 
-    val expectedHTML =
+    val expectedHtml =
       """
     <!DOCTYPE html>
     <html lang="en">
@@ -261,6 +261,6 @@ class CoverageReporterTest {
     </html>
       """.trimIndent()
 
-    assertThat(reportText).isEqualTo(expectedHTML)
+    assertThat(reportText).isEqualTo(expectedHtml)
   }
 }