Fixes #5243: Technical Analytics Milestone 3 - New App Health Metrics

data/src/test/java/org/oppia/android/data/backends/gae/NetworkLoggingInterceptorTest.kt

@@ -84,7 +84,7 @@ class NetworkLoggingInterceptorTest {
   }
 
   @Test
-  fun testLoggingInterceptor_makeNetworkCall_emitsRetrofitCallContext() = runBlockingTest {
+  fun testLoggingInterceptor_makeNetworkCall_succeeds() = runBlockingTest {
     mockWebServer.enqueue(MockResponse().setBody(testResponseBody))
     client.newCall(request).execute()
     testCoroutineDispatchers.advanceUntilIdle()
@@ -102,7 +102,8 @@ class NetworkLoggingInterceptorTest {
   }
 
   @Test
-  fun testLoggingInterceptor_makeFailingNetworkCall_emitsRetrofitCall_andCallFailedContext() =
+//  fun testLoggingInterceptor_makeFailingNetworkCall_emitsRetrofitCall_andCallFailedContext() =
+  fun testLoggingInterceptor_makeNetworkCallWithInvalidUrl_failsAndCompletes() =
     runBlockingTest {
       val pageNotFound = HttpURLConnection.HTTP_NOT_FOUND
       val mockResponse = MockResponse()
@@ -137,7 +138,7 @@ class NetworkLoggingInterceptorTest {
     }
 
   @Test
-  fun testLoggingInterceptor_makeCrashingNetworkCall_emitsRetrofitCallFailedContext() =
+  fun testLoggingInterceptor_makeCrashingNetworkCall_failsAndCompletes() =
     runBlockingTest {
       mockWebServer.shutdown()
       try { client.newCall(request).execute() } catch (e: Exception) { }

domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserver.kt

@@ -188,7 +188,7 @@ class ApplicationLifecycleObserver @Inject constructor(
     }.invokeOnCompletion { failure ->
       if (failure != null) {
         oppiaLogger.e(
-          "ActivityLifecycleObserver",
+          "ApplicationLifecycleObserver",
           "Encountered error while trying to log app's time in the foreground.",
           failure
         )

domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/ApplicationLifecycleObserverTest.kt

@@ -62,6 +62,7 @@ import java.net.HttpURLConnection
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.APP_IN_FOREGROUND_TIME
 
 private const val TEST_TIMESTAMP_IN_MILLIS_ONE = 1556094000000
 private const val TEST_TIMESTAMP_IN_MILLIS_TWO = 1556094100000
@@ -421,19 +422,19 @@ class ApplicationLifecycleObserverTest {
     applicationLifecycleObserver.onAppInBackground()
     testCoroutineDispatchers.runCurrent()
 
-    val eventLog = getOneOfLastTwoEventsLogged(ActivityContextCase.APP_IN_FOREGROUND_TIME)
+    val eventLog = getOneOfLastTwoEventsLogged(APP_IN_FOREGROUND_TIME)
     val eventLogContext = eventLog.context
 
     assertThat(eventLogContext.activityContextCase)
-      .isEqualTo(ActivityContextCase.APP_IN_FOREGROUND_TIME)
+      .isEqualTo(APP_IN_FOREGROUND_TIME)
     assertThat(eventLogContext.appInForegroundTime.foregroundTime.toLong())
       .isEqualTo(TEST_TIMESTAMP_APP_IN_FOREGROUND_MILLIS)
     assertThat(eventLogContext.appInForegroundTime.appSessionId).isEqualTo(sessionId)
     assertThat(eventLogContext.appInForegroundTime.installationId).isEqualTo(installationId)
   }
 
   @Test
-  fun testObserver_onAppInForeground_observesAndLogsConsoleErrors() {
+  fun testObserver_onAppInForeground_onConsoleError_logsConsoleErrors() {
     setUpTestApplicationComponent()
 
     applicationLifecycleObserver.onCreate()
@@ -456,7 +457,7 @@ class ApplicationLifecycleObserverTest {
   }
 
   @Test
-  fun testObserver_onAppInForeground_observesAndLogsNetworkCalls() {
+  fun testObserver_onAppInForeground_onNetworkCall_logsNetworkCalls() {
     setUpTestApplicationComponent()
     setUpRetrofitApiCall()
 
@@ -481,7 +482,7 @@ class ApplicationLifecycleObserverTest {
   }
 
   @Test
-  fun testObserver_onAppInForeground_observesAndLogsFailedNetworkCalls() {
+  fun testObserver_onAppInForeground_onNetworkCall_logsFailedNetworkCalls() {
     setUpTestApplicationComponent()
     setUpRetrofitApiCall()