Revert usage of mockClock

Author: tejasd

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

@@ -231,7 +231,7 @@ public void testIsExpiredReturnsFalseWhenCurrentSessionLengthIsLessThanMaxSessio
                 - TimeUnit.MINUTES.toMicros(1)); // Default Max Session Length is 4 hours
     when(mockClock.getTime()).thenReturn(mockTimer);
 
-    PerfSession session = PerfSession.createWithId("sessionId");
+    PerfSession session = new PerfSession("sessionId", mockClock);
     assertThat(session.isSessionRunningTooLong()).isFalse();
   }
 
@@ -242,7 +242,7 @@ public void testIsExpiredReturnsFalseWhenCurrentSessionLengthIsEqualToMaxSession
         .thenReturn(TimeUnit.HOURS.toMicros(4)); // Default Max Session Length is 4 hours
     when(mockClock.getTime()).thenReturn(mockTimer);
 
-    PerfSession session = PerfSession.createWithId("sessionId");
+    PerfSession session = new PerfSession("sessionId", mockClock);
     assertThat(session.isSessionRunningTooLong()).isFalse();
   }
 
@@ -253,7 +253,7 @@ public void testIsExpiredReturnsTrueWhenCurrentSessionLengthIsGreaterThanMaxSess
         .thenReturn(TimeUnit.HOURS.toMicros(5)); // Default Max Session Length is 4 hours
     when(mockClock.getTime()).thenReturn(mockTimer);
 
-    PerfSession session = PerfSession.createWithId("sessionId");
+    PerfSession session = new PerfSession("sessionId", mockClock);
     assertThat(session.isSessionRunningTooLong()).isTrue();
   }
 }

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

@@ -112,7 +112,7 @@ public void testSessionIdDoesNotUpdateIfPerfSessionRunsTooLong() {
     Timer mockTimer = mock(Timer.class);
     when(mockClock.getTime()).thenReturn(mockTimer);
 
-    PerfSession session = new PerfSession("sessionId", mockClock, true);
+    PerfSession session = new PerfSession("sessionId", mockClock);
     SessionManager testSessionManager =
         new SessionManager(mockGaugeManager, session, mockAppStateMonitor);
 
@@ -131,10 +131,10 @@ public void testUpdatePerfSessionStartsCollectingGaugesIfSessionIsVerbose() {
     when(mockClock.getTime()).thenReturn(mockTimer);
     when(mockAppStateMonitor.getAppState()).thenReturn(ApplicationProcessState.FOREGROUND);
 
-    PerfSession previousSession = new PerfSession("previousSession", mockClock, true);
+    PerfSession previousSession = new PerfSession("previousSession", mockClock);
     previousSession.setGaugeAndEventCollectionEnabled(false);
 
-    PerfSession newSession = new PerfSession("newSession", mockClock, true);
+    PerfSession newSession = new PerfSession("newSession", mockClock);
     newSession.setGaugeAndEventCollectionEnabled(true);
 
     SessionManager testSessionManager =

firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java

@@ -41,7 +41,6 @@
 import com.google.firebase.perf.v1.CpuMetricReading;
 import com.google.firebase.perf.v1.GaugeMetadata;
 import com.google.firebase.perf.v1.GaugeMetric;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import com.google.testing.timing.FakeScheduledExecutorService;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -408,8 +407,6 @@ public void testStopCollectingGaugesCreatesOneLastJobToConsumeAnyPendingMetrics(
     // It's not currently logging to transport.
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
 
-    // An AQS session ID is expected when stopping Gauge collection.
-    fakeSession.setAQSId(new SessionSubscriber.SessionDetails("aqsSessionId"));
     testGaugeManager.stopCollectingGauges();
     assertThat(fakeScheduledExecutorService.isEmpty()).isFalse();
 
@@ -427,9 +424,9 @@ public void testStopCollectingGaugesCreatesOneLastJobToConsumeAnyPendingMetrics(
     GaugeMetric recordedGaugeMetric =
         getLastRecordedGaugeMetric(ApplicationProcessState.BACKGROUND, 1);
     assertThatCpuGaugeMetricWasSentToTransport(
-        fakeSession.aqsSessionId(), recordedGaugeMetric, fakeCpuMetricReading);
+        fakeSession.sessionId(), recordedGaugeMetric, fakeCpuMetricReading);
     assertThatMemoryGaugeMetricWasSentToTransport(
-        fakeSession.aqsSessionId(), recordedGaugeMetric, fakeMemoryMetricReading);
+        fakeSession.sessionId(), recordedGaugeMetric, fakeMemoryMetricReading);
   }
 
   @Test
@@ -451,7 +448,6 @@ public void testGaugeManagerDoesNotClearTheQueueUnlessUpdated() {
     assertThat(fakeCpuGaugeCollector.cpuMetricReadings).isNotEmpty();
     assertThat(fakeMemoryGaugeCollector.memoryMetricReadings).isNotEmpty();
 
-    fakeSession.setAQSId(new SessionSubscriber.SessionDetails("aqsSessionId"));
     testGaugeManager.updateGaugeCollection(ApplicationProcessState.FOREGROUND);
 
     fakeScheduledExecutorService.simulateSleepExecutingAtMostOneTask();