Remove LinkedHashMap TODO.

Author: tejasd

firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java

@@ -83,123 +83,7 @@ public void setApplicationContext_initializeGaugeMetadataManager()
     testSessionManager.setApplicationContext(mockApplicationContext);
 
     testSessionManager.getSyncInitFuture().get();
-    inOrder.verify(mockGaugeManager).initializeGaugeMetadataManager(any());
-  }
-
-  @Test
-  public void testOnUpdateAppStateDoesNothingDuringAppStart() {
-    String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
-
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
-
-    AppStateMonitor.getInstance().setIsColdStart(true);
-
-    SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.FOREGROUND);
-    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
-  }
-
-  @Test
-  public void testOnUpdateAppStateGeneratesNewSessionIdOnForegroundState() {
-    String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
-
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
-
-    SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.FOREGROUND);
-    assertThat(oldSessionId).isNotEqualTo(SessionManager.getInstance().perfSession().sessionId());
-  }
-
-  @Test
-  public void testOnUpdateAppStateDoesntGenerateNewSessionIdOnBackgroundState() {
-    String oldSessionId = SessionManager.getInstance().perfSession().sessionId();
-
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
-
-    SessionManager.getInstance().onUpdateAppState(ApplicationProcessState.BACKGROUND);
-    assertThat(oldSessionId).isEqualTo(SessionManager.getInstance().perfSession().sessionId());
-  }
-
-  @Test
-  public void testOnUpdateAppStateGeneratesNewSessionIdOnBackgroundStateIfPerfSessionExpires() {
-    when(mockPerfSession.isSessionRunningTooLong()).thenReturn(true);
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    String oldSessionId = testSessionManager.perfSession().sessionId();
-
-    assertThat(oldSessionId).isNotNull();
-    assertThat(oldSessionId).isEqualTo(testSessionManager.perfSession().sessionId());
-
-    testSessionManager.onUpdateAppState(ApplicationProcessState.BACKGROUND);
-    assertThat(oldSessionId).isNotEqualTo(testSessionManager.perfSession().sessionId());
-  }
-
-  @Test
-  public void
-      testOnUpdateAppStateDoesntMakeGaugeManagerLogGaugeMetadataOnForegroundStateIfSessionIsNonVerbose() {
-    forceNonVerboseSession();
-
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
-
-    verify(mockGaugeManager, never())
-        .logGaugeMetadata(
-            anyString(), nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
-  }
-
-  @Test
-  public void
-      testOnUpdateAppStateDoesntMakeGaugeManagerLogGaugeMetadataOnBackgroundStateEvenIfSessionIsVerbose() {
-    forceVerboseSession();
-
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.onUpdateAppState(ApplicationProcessState.BACKGROUND);
-
-    verify(mockGaugeManager, never())
-        .logGaugeMetadata(
-            anyString(), nullable(com.google.firebase.perf.v1.ApplicationProcessState.class));
-  }
-
-  @Test
-  public void testOnUpdateAppStateMakesGaugeManagerStartCollectingGaugesIfSessionIsVerbose() {
-    forceVerboseSession();
-
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.onUpdateAppState(ApplicationProcessState.FOREGROUND);
-
-    verify(mockGaugeManager)
-        .startCollectingGauges(AdditionalMatchers.not(eq(mockPerfSession)), any());
-  }
-
-  // LogGaugeData on new perf session when Verbose
-  // NotLogGaugeData on new perf session when not Verbose
-  // Mark Session as expired after time limit.
-
-  @Test
-  public void testOnUpdateAppStateMakesGaugeManagerStopCollectingGaugesIfSessionIsNonVerbose() {
-    forceNonVerboseSession();
-
-    SessionManager testSessionManager =
-        new SessionManager(mockGaugeManager, mockPerfSession, mockAppStateMonitor);
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId"));
-
-    verify(mockGaugeManager).stopCollectingGauges();
-  }
-
-  @Test
-  public void testOnUpdateAppStateMakesGaugeManagerStopCollectingGaugesWhenSessionsDisabled() {
-    forceSessionsFeatureDisabled();
-
-    SessionManager testSessionManager =
-        new SessionManager(
-            mockGaugeManager, PerfSession.createWithId("testSessionId"), mockAppStateMonitor);
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
-
-    verify(mockGaugeManager).stopCollectingGauges();
+    inOrder.verify(mockGaugeManager).initializeGaugeMetadataManager(any(), ApplicationProcessState.FOREGROUND);
   }
 
   @Test
@@ -236,7 +120,7 @@ public void testPerfSessionExpiredMakesGaugeManagerStopsCollectingGaugesIfSessio
         .thenReturn(TimeUnit.HOURS.toMicros(5)); // Default Max Session Length is 4 hours
 
     assertThat(session.isSessionRunningTooLong()).isTrue();
-    verify(mockGaugeManager, times(0)).logGaugeMetadata(any(), any());
+    verify(mockGaugeManager, times(0)).logGaugeMetadata(any());
   }
 
   @Test
@@ -247,7 +131,7 @@ public void testPerfSession_sessionAwareObjects_doesntNotifyIfNotRegistered() {
     FakeSessionAwareObject spySessionAwareObjectOne = spy(new FakeSessionAwareObject());
     FakeSessionAwareObject spySessionAwareObjectTwo = spy(new FakeSessionAwareObject());
 
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
+    testSessionManager.updatePerfSession(PerfSession.createNewSession());
 
     verify(spySessionAwareObjectOne, never())
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));
@@ -266,8 +150,8 @@ public void testPerfSession_sessionAwareObjects_NotifiesIfRegistered() {
     testSessionManager.registerForSessionUpdates(new WeakReference<>(spySessionAwareObjectOne));
     testSessionManager.registerForSessionUpdates(new WeakReference<>(spySessionAwareObjectTwo));
 
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
+    testSessionManager.updatePerfSession(PerfSession.createNewSession());
+    testSessionManager.updatePerfSession(PerfSession.createNewSession());
 
     verify(spySessionAwareObjectOne, times(2))
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));
@@ -291,11 +175,11 @@ public void testPerfSession_sessionAwareObjects_DoesNotNotifyIfUnregistered() {
     testSessionManager.registerForSessionUpdates(weakSpySessionAwareObjectOne);
     testSessionManager.registerForSessionUpdates(weakSpySessionAwareObjectTwo);
 
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId1"));
+    testSessionManager.updatePerfSession(PerfSession.createNewSession());
 
     testSessionManager.unregisterForSessionUpdates(weakSpySessionAwareObjectOne);
     testSessionManager.unregisterForSessionUpdates(weakSpySessionAwareObjectTwo);
-    testSessionManager.updatePerfSession(PerfSession.createWithId("testSessionId2"));
+    testSessionManager.updatePerfSession(PerfSession.createNewSession());
 
     verify(spySessionAwareObjectOne, times(1))
         .updateSession(ArgumentMatchers.nullable(PerfSession.class));