Fix unit tests

Author: jrodiz

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerfRegistrarTest.java

@@ -24,6 +24,7 @@
 import com.google.firebase.components.Dependency;
 import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -39,13 +40,14 @@ public void testGetComponents() {
     FirebasePerfRegistrar firebasePerfRegistrar = new FirebasePerfRegistrar();
     List<Component<?>> components = firebasePerfRegistrar.getComponents();
 
-    assertThat(components).hasSize(3);
+    assertThat(components).hasSize(4);
 
     Component<?> firebasePerfComponent = components.get(0);
 
     assertThat(firebasePerfComponent.getDependencies())
         .containsExactly(
             Dependency.required(FirebaseApp.class),
+            Dependency.required(SessionManager.class),
             Dependency.requiredProvider(RemoteConfigComponent.class),
             Dependency.required(FirebaseInstallationsApi.class),
             Dependency.requiredProvider(TransportFactory.class),
@@ -59,6 +61,7 @@ public void testGetComponents() {
         .containsExactly(
             Dependency.required(Qualified.qualified(UiThread.class, Executor.class)),
             Dependency.required(FirebaseApp.class),
+            Dependency.required(SessionManager.class),
             Dependency.optionalProvider(StartupTime.class));
 
     assertThat(firebasePerfEarlyComponent.isLazy()).isFalse();

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java

@@ -53,6 +53,9 @@ public class FirebasePerformanceTestBase {
   protected static final String FAKE_FIREBASE_PROJECT_ID = "fir-perftestapp";
 
   protected Context appContext;
+  protected SessionManager provideSessionManager() {
+    return SessionManager.getInstance();
+  }
 
   @Before
   public void setUpFirebaseApp() {
@@ -85,19 +88,19 @@ protected static void forceSessionsFeatureDisabled() {
     ConfigResolver.getInstance().setMetadataBundle(new ImmutableBundle(bundle));
   }
 
-  protected static void forceVerboseSession() {
+  protected void forceVerboseSession() {
     forceVerboseSessionWithSamplingPercentage(100);
   }
 
-  protected static void forceNonVerboseSession() {
+  protected void forceNonVerboseSession() {
     forceVerboseSessionWithSamplingPercentage(0);
   }
 
-  private static void forceVerboseSessionWithSamplingPercentage(long samplingPercentage) {
+  private void forceVerboseSessionWithSamplingPercentage(long samplingPercentage) {
     Bundle bundle = new Bundle();
     bundle.putFloat("sessions_sampling_percentage", samplingPercentage);
     ConfigResolver.getInstance().setMetadataBundle(new ImmutableBundle(bundle));
 
-    SessionManager.getInstance().setPerfSession(PerfSession.createWithId("sessionId"));
+    provideSessionManager().setPerfSession(PerfSession.createWithId("sessionId"));
   }
 }

firebase-perf/src/test/java/com/google/firebase/perf/PerformanceTests.kt

@@ -26,10 +26,14 @@ import com.google.firebase.app
 import com.google.firebase.initialize
 import com.google.firebase.perf.FirebasePerformance.HttpMethod
 import com.google.firebase.perf.application.AppStateMonitor
+import com.google.firebase.perf.config.ConfigResolver
 import com.google.firebase.perf.metrics.HttpMetric
 import com.google.firebase.perf.metrics.Trace
 import com.google.firebase.perf.metrics.getTraceCounter
 import com.google.firebase.perf.metrics.getTraceCounterCount
+import com.google.firebase.perf.session.PerfSession
+import com.google.firebase.perf.session.SessionManager
+import com.google.firebase.perf.session.gauges.GaugeManager
 import com.google.firebase.perf.transport.TransportManager
 import com.google.firebase.perf.util.Clock
 import com.google.firebase.perf.util.Timer
@@ -47,6 +51,7 @@ import org.mockito.ArgumentMatchers.nullable
 import org.mockito.Captor
 import org.mockito.Mock
 import org.mockito.Mockito.doAnswer
+import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`
 import org.mockito.MockitoAnnotations.initMocks
@@ -103,8 +108,14 @@ class PerformanceTests : BaseTestCase() {
 
   @Mock lateinit var mockClock: Clock
 
+  @Mock lateinit var mockGaugeManager: GaugeManager
+
   @Mock lateinit var mockAppStateMonitor: AppStateMonitor
 
+  private val session = PerfSession("sessionId", Clock())
+
+  private lateinit var sessionManager: SessionManager
+
   @Captor lateinit var argMetricCaptor: ArgumentCaptor<NetworkRequestMetric>
 
   @Captor lateinit var argumentsCaptor: ArgumentCaptor<TraceMetric>
@@ -119,6 +130,9 @@ class PerformanceTests : BaseTestCase() {
     `when`(timerMock.getMicros()).thenReturn(1000L)
     `when`(timerMock.getDurationMicros()).thenReturn(2000L).thenReturn(3000L)
     doAnswer { Timer(currentTime) }.`when`(mockClock).getTime()
+
+    sessionManager = SessionManager(mockGaugeManager, session, mockAppStateMonitor)
+    `when`(mockAppStateMonitor.sessionManager).thenReturn(sessionManager)
   }
 
   @Test
@@ -129,7 +143,7 @@ class PerformanceTests : BaseTestCase() {
   @Test
   fun `httpMetric wrapper test `() {
     val metric =
-      HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock)
+      HttpMetric("https://www.google.com/", HttpMethod.GET, transportManagerMock, timerMock, sessionManager)
     metric.trace { setHttpResponseCode(200) }
 
     verify(transportManagerMock)

firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java

@@ -39,6 +39,8 @@
 import com.google.firebase.perf.config.DeviceCacheManager;
 import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.session.PerfSession;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.session.gauges.GaugeManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
@@ -72,6 +74,12 @@ public class AppStateMonitorTest extends FirebasePerformanceTestBase {
 
   @Captor private ArgumentCaptor<TraceMetric> argTraceMetric;
 
+  @Mock private GaugeManager mockGaugeManager;
+  @Mock private AppStateMonitor mockAppStateMonitor;
+  private PerfSession session = new PerfSession("sessionId", new Clock());
+  private SessionManager sessionManager =
+          new SessionManager(mockGaugeManager, session, mockAppStateMonitor);
+
   private long currentTime = 0;
 
   private Activity activity1;
@@ -96,6 +104,7 @@ public void setUp() {
   @Test
   public void foregroundBackgroundEvent_activityStateChanges_fgBgEventsCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     // activity1 comes to foreground.
     currentTime = 1;
     monitor.incrementCount("counter1", 10);
@@ -156,6 +165,7 @@ public void foregroundBackgroundEvent_activityStateChanges_fgBgEventsCreated() {
   @Test
   public void testIncrementCount() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     monitor.incrementCount("counter1", 10);
     monitor.incrementCount("counter2", 20);
@@ -176,6 +186,7 @@ public void testIncrementCount() {
   @Test
   public void testTwoActivities() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     // activity1 comes to foreground.
     currentTime = 1;
     monitor.onActivityResumed(activity1);
@@ -250,6 +261,7 @@ public void testTwoActivities() {
   @Test
   public void testAppStateCallbackWithTrace() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Trace trace = new Trace("TRACE_1", transportManager, clock, monitor);
     // Trace is not started yet, default state is APPLICATION_PROCESS_STATE_UNKNOWN
     Assert.assertEquals(
@@ -289,10 +301,11 @@ public void testAppStateCallbackWithTrace() {
   @Test
   public void testAppStateCallbackWithNetworkRequestMetricBuilder() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     // registerForAppState() is called by NetworkRequestMetricBuilder's constructor.
     NetworkRequestMetricBuilder builder =
         new NetworkRequestMetricBuilder(
-            mock(TransportManager.class), monitor, mock(GaugeManager.class));
+            mock(TransportManager.class), monitor, mock(GaugeManager.class), sessionManager);
     Assert.assertEquals(ApplicationProcessState.BACKGROUND, builder.getAppState());
     // activity1 comes to foreground.
     currentTime = 1;
@@ -320,6 +333,7 @@ public void testAppStateCallbackWithNetworkRequestMetricBuilder() {
   @Test
   public void testRegisterActivityLifecycleCallbacks() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Context context = mock(Context.class);
     Application application = mock(Application.class);
     when(context.getApplicationContext()).thenReturn(application);
@@ -334,6 +348,7 @@ public void testRegisterActivityLifecycleCallbacks() {
   @Test
   public void testUnregisterActivityLifecycleCallbacks() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Context context = mock(Context.class);
     Application application = mock(Application.class);
     when(context.getApplicationContext()).thenReturn(application);
@@ -346,6 +361,7 @@ public void testUnregisterActivityLifecycleCallbacks() {
   @Test
   public void testUnregisterActivityLifecycleCallbacksBeforeItWasRegistered() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Context context = mock(Context.class);
     Application application = mock(Application.class);
     when(context.getApplicationContext()).thenReturn(application);
@@ -357,6 +373,7 @@ public void testUnregisterActivityLifecycleCallbacksBeforeItWasRegistered() {
   @Test
   public void screenTrace_twoActivities_traceStartedAndStoppedWithActivityLifecycle() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     Activity[] arr = {activity1, activity2};
     for (int i = 0; i < arr.length; ++i) {
@@ -376,6 +393,7 @@ public void screenTrace_twoActivities_traceStartedAndStoppedWithActivityLifecycl
   @Test
   public void screenTrace_noHardwareAccelerated_noExceptionThrown() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Activity activityWithNonHardwareAcceleratedView =
         createFakeActivity(/* isHardwareAccelerated= */ false);
 
@@ -388,6 +406,7 @@ public void screenTrace_noHardwareAccelerated_noExceptionThrown() {
   @Test
   public void screenTrace_perfMonDisabledAtBuildTime_traceNotCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Activity activityWithNonHardwareAcceleratedView =
         createFakeActivity(/* isHardwareAccelerated= */ true);
 
@@ -404,6 +423,7 @@ public void screenTrace_perfMonDisabledAtBuildTime_traceNotCreated() {
   @Test
   public void screenTrace_perfMonEnabledSwitchAtRuntime_traceCreationDependsOnRuntime() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Activity activityWithNonHardwareAcceleratedView =
         createFakeActivity(/* isHardwareAccelerated= */ true);
 
@@ -436,6 +456,7 @@ public void screenTrace_perfMonEnabledSwitchAtRuntime_traceCreationDependsOnRunt
   @Test
   public void screenTrace_perfMonDeactivated_traceNotCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Activity activityWithNonHardwareAcceleratedView =
         createFakeActivity(/* isHardwareAccelerated= */ true);
     ConfigResolver configResolver = ConfigResolver.getInstance();
@@ -458,6 +479,7 @@ public void screenTrace_perfMonDeactivated_traceNotCreated() {
   @Test
   public void foregroundTrace_perfMonDisabledAtRuntime_traceNotCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // activity1 comes to foreground.
     currentTime = 1;
@@ -488,6 +510,7 @@ public void foregroundTrace_perfMonDisabledAtRuntime_traceNotCreated() {
   @Test
   public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // Firebase Performance is disabled at build time.
     Bundle bundle = new Bundle();
@@ -525,6 +548,7 @@ public void foregroundTrace_perfMonEnabledAtRuntime_traceCreated() {
   @Test
   public void foregroundTrace_perfMonDeactivated_traceCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // Firebase Performance is deactivated at build time.
     Bundle bundle = new Bundle();
@@ -560,6 +584,7 @@ public void foregroundTrace_perfMonDeactivated_traceCreated() {
   @Test
   public void backgroundTrace_perfMonDisabledAtRuntime_traceNotCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // activity1 comes to background.
     currentTime = 1;
@@ -593,6 +618,7 @@ public void backgroundTrace_perfMonDisabledAtRuntime_traceNotCreated() {
   @Test
   public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // Firebase Performance is disabled at build time.
     Bundle bundle = new Bundle();
@@ -631,6 +657,7 @@ public void backgroundTrace_perfMonEnabledAtRuntime_traceCreated() {
   @Test
   public void backgroundTrace_perfMonDeactivated_traceCreated() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
 
     // Firebase Performance is deactivated at build time.
     Bundle bundle = new Bundle();
@@ -667,6 +694,7 @@ public void backgroundTrace_perfMonDeactivated_traceCreated() {
   @Test
   public void activityStateChanges_singleSubscriber_callbackIsCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Map<Integer, ApplicationProcessState> subscriberState = new HashMap<>();
 
     // Register callbacks, but note that each callback is saved in a local variable. Otherwise
@@ -687,6 +715,7 @@ public void activityStateChanges_singleSubscriber_callbackIsCalled() {
   @Test
   public void activityStateChanges_multipleSubscribers_callbackCalledOnEachSubscriber() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     Map<Integer, ApplicationProcessState> subscriberState = new HashMap<>();
 
     // Register callbacks, but note that each callback is saved in a local variable. Otherwise
@@ -719,6 +748,7 @@ public void activityStateChanges_multipleSubscribers_callbackCalledOnEachSubscri
   @Test
   public void appColdStart_singleSubscriber_callbackIsCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     FirebasePerformanceInitializer mockInitializer = mock(FirebasePerformanceInitializer.class);
     monitor.registerForAppColdStart(mockInitializer);
 
@@ -730,6 +760,7 @@ public void appColdStart_singleSubscriber_callbackIsCalled() {
   @Test
   public void appHotStart_singleSubscriber_callbackIsNotCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     FirebasePerformanceInitializer mockInitializer = mock(FirebasePerformanceInitializer.class);
     monitor.registerForAppColdStart(mockInitializer);
 
@@ -748,6 +779,7 @@ public void appHotStart_singleSubscriber_callbackIsNotCalled() {
   @Test
   public void appColdStart_multipleSubscriber_callbackIsCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     FirebasePerformanceInitializer mockInitializer1 = mock(FirebasePerformanceInitializer.class);
     FirebasePerformanceInitializer mockInitializer2 = mock(FirebasePerformanceInitializer.class);
     monitor.registerForAppColdStart(mockInitializer1);
@@ -762,6 +794,7 @@ public void appColdStart_multipleSubscriber_callbackIsCalled() {
   @Test
   public void appColdStart_singleSubscriberRegistersForMultipleTimes_oneCallbackIsCalled() {
     AppStateMonitor monitor = new AppStateMonitor(transportManager, clock);
+    monitor.setSessionManager(sessionManager);
     FirebasePerformanceInitializer mockInitializer1 = mock(FirebasePerformanceInitializer.class);
     monitor.registerForAppColdStart(mockInitializer1);
     monitor.registerForAppColdStart(mockInitializer1);