Fix a unit test and add a TODO

Author: tejasd

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

@@ -36,7 +36,6 @@
 public class FirebasePerformanceTestBase {
   @BeforeClass
   public static void setUpBeforeClass() {
-    ShadowLog.stream = System.out;
     GaugeCounter.INSTANCE.resetCounter();
   }
 
@@ -64,6 +63,7 @@ public static void setUpBeforeClass() {
 
   @Before
   public void setUpFirebaseApp() {
+    ShadowLog.stream = System.out;
     appContext = ApplicationProvider.getApplicationContext();
 
     ShadowPackageManager shadowPackageManager = shadowOf(appContext.getPackageManager());

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

@@ -341,12 +341,12 @@ public void testGaugeCounterStartsAJobToConsumeTheGeneratedMetrics() throws Inte
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
 
     // Generate metrics that don't exceed the GaugeCounter.MAX_COUNT.
-    generateMetricsAndIncrementCounter(24);
+    generateMetricsAndIncrementCounter(20);
 
     // There's still no job to log the gauges.
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
 
-    generateMetricsAndIncrementCounter(2);
+    generateMetricsAndIncrementCounter(10);
 
     assertThat(fakeScheduledExecutorService.isEmpty()).isFalse();
     assertThat(fakeScheduledExecutorService.getDelayToNextTask(TimeUnit.MILLISECONDS))
@@ -366,7 +366,7 @@ public void testGaugeCounterStartsAJobToConsumeTheGeneratedMetrics() throws Inte
     int recordedGaugeMetricsCount =
         recordedGaugeMetric.getAndroidMemoryReadingsCount()
             + recordedGaugeMetric.getCpuMetricReadingsCount();
-    assertThat(recordedGaugeMetricsCount).isEqualTo(26);
+    assertThat(recordedGaugeMetricsCount).isEqualTo(30);
 
     assertThat(recordedGaugeMetric.getSessionId()).isEqualTo(testSessionId(1));
   }
@@ -501,19 +501,21 @@ public void testStopCollectingGaugesCreatesOneLastJobToConsumeAnyPendingMetrics(
     testGaugeManager.startCollectingGauges(fakeSession);
     assertThat(fakeScheduledExecutorService.isEmpty()).isTrue();
 
+    generateMetricsAndIncrementCounter(2);
+
     testGaugeManager.stopCollectingGauges();
     assertThat(fakeScheduledExecutorService.isEmpty()).isFalse();
 
-    generateMetricsAndIncrementCounter(2);
-
     assertThat(fakeScheduledExecutorService.getDelayToNextTask(TimeUnit.MILLISECONDS))
         .isEqualTo(TIME_TO_WAIT_BEFORE_FLUSHING_GAUGES_QUEUE_MS);
 
     fakeScheduledExecutorService.simulateSleepExecutingAtMostOneTask();
+
     GaugeMetric recordedGaugeMetric =
         getLastRecordedGaugeMetric(ApplicationProcessState.FOREGROUND);
     assertThat(recordedGaugeMetric.getSessionId()).isEqualTo(testSessionId(1));
 
+    // TODO(b/394127311): Investigate why this isn't 0 on local runs.
     assertThat(GaugeCounter.INSTANCE.count()).isEqualTo(0);
   }