Merge branch 'oppia:develop' into migrate-onBackPressed

oppia · Jun 21, 2024 · dc0fd1f · dc0fd1f
2 parents 9390eef + 14976d9
commit dc0fd1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/data/src/test/java/org/oppia/android/data/backends/gae/NetworkLoggingInterceptorTest.kt b/data/src/test/java/org/oppia/android/data/backends/gae/NetworkLoggingInterceptorTest.kt
@@ -93,6 +93,7 @@ class NetworkLoggingInterceptorTest {
     val firstRequestsDeferred = CoroutineScope(backgroundTestDispatcher).async {
       networkLoggingInterceptor.logNetworkCallFlow.take(1).toList()
     }
+    testCoroutineDispatchers.advanceUntilIdle() // Ensure the flow is subscribed before emit().
     client.newCall(request).execute()
     testCoroutineDispatchers.advanceUntilIdle()
 
@@ -116,6 +117,7 @@ class NetworkLoggingInterceptorTest {
       networkLoggingInterceptor.logFailedNetworkCallFlow.take(1).toList()
     }
     mockWebServer.enqueue(mockResponse)
+    testCoroutineDispatchers.advanceUntilIdle() // Ensure the flow is subscribed before emit().
     client.newCall(request).execute()
     testCoroutineDispatchers.advanceUntilIdle()
 
@@ -141,6 +143,7 @@ class NetworkLoggingInterceptorTest {
     val firstFailingRequestsDeferred = CoroutineScope(backgroundTestDispatcher).async {
       networkLoggingInterceptor.logFailedNetworkCallFlow.take(1).toList()
     }
+    testCoroutineDispatchers.advanceUntilIdle() // Ensure the flow is subscribed before emit().
     try {
       client.newCall(request).execute()
     } catch (e: ConnectException) {

diff --git a/utility/src/test/java/org/oppia/android/util/logging/ConsoleLoggerTest.kt b/utility/src/test/java/org/oppia/android/util/logging/ConsoleLoggerTest.kt
@@ -65,6 +65,8 @@ class ConsoleLoggerTest {
     val firstErrorContextsDeferred = CoroutineScope(backgroundTestDispatcher).async {
       consoleLogger.logErrorMessagesFlow.take(1).toList()
     }
+
+    testCoroutineDispatchers.advanceUntilIdle() // Ensure the flow is subscribed before emit().
     consoleLogger.e(testTag, testMessage)
     testCoroutineDispatchers.advanceUntilIdle()