Merge branch 'develop' of https://github.com/Rd4dev/oppia-android int…

…o code_coverage_test_file_exemption_rebuild
oppia · Jun 21, 2024 · 760120c · 760120c
2 parents dd24d3c + 14976d9
commit 760120c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {

diff --git a/data/build.gradle b/data/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {

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/domain/build.gradle b/domain/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {

diff --git a/utility/build.gradle b/utility/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {

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()