Merge branch 'code_coverage_fix_edge_cases' of https://github.com/opp…

…ia/oppia-android into code_coverage_many_to_one_targets
oppia · Jul 12, 2024 · 9b5995e · 9b5995e
2 parents aaf3caf + d3eb372
commit 9b5995e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt b/scripts/src/java/org/oppia/android/scripts/coverage/RunCoverage.kt
@@ -57,7 +57,7 @@ fun main(vararg args: String) {
  ScriptBackgroundCoroutineDispatcher().use { scriptBgDispatcher ->
  val processTimeout: Long = args.find { it.startsWith("processTimeout=") }
  ?.substringAfter("=")
- ?.toLongOrNull() ?: 10
+ ?.toLongOrNull() ?: 5
 
  val commandExecutor: CommandExecutor = CommandExecutorImpl(
  scriptBgDispatcher, processTimeout = processTimeout, processTimeoutUnit = TimeUnit.MINUTES

diff --git a/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt b/scripts/src/javatests/org/oppia/android/scripts/coverage/RunCoverageTest.kt
@@ -73,8 +73,6 @@ class RunCoverageTest {
  }
  }
  """.trimIndent()
-
- System.setOut(PrintStream(outContent))
  }
 
  @After
@@ -198,6 +196,7 @@ class RunCoverageTest {
 
  @Test
  fun testRunCoverage_testFileExempted_noCoverage() {
+ System.setOut(PrintStream(outContent))
  val exemptedFilePath = "app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt"
 
  RunCoverage(
@@ -1036,7 +1035,7 @@ class RunCoverageTest {
 
  private fun initializeCommandExecutorWithLongProcessWaitTime(): CommandExecutorImpl {
  return CommandExecutorImpl(
- scriptBgDispatcher, processTimeout = 10, processTimeoutUnit = TimeUnit.MINUTES
+ scriptBgDispatcher, processTimeout = 5, processTimeoutUnit = TimeUnit.MINUTES
  )
  }
 }