@@ -130,7 +130,6 @@ public void setUp() {
130130 @ After
131131 public void tearDown () {
132132 shadowOf (Looper .getMainLooper ()).idle ();
133- GaugeCounter .INSTANCE .resetCounter ();
134133 }
135134
136135 @ Test
@@ -332,11 +331,11 @@ public void stopCollectingGauges_invalidGaugeCollectionFrequency_appInForeground
332331 }
333332
334333 @ Test
335- public void testGaugeCounterStartsAJobToConsumeTheGeneratedMetrics () {
334+ public void testGaugeCounterStartsAJobToConsumeTheGeneratedMetrics () throws InterruptedException {
336335 PerfSession fakeSession = createTestSession (1 );
337336 testGaugeManager .setApplicationProcessState (ApplicationProcessState .FOREGROUND );
338337 testGaugeManager .startCollectingGauges (fakeSession );
339- GaugeCounter .setGaugeManager (testGaugeManager );
338+ GaugeCounter .INSTANCE . setGaugeManager (testGaugeManager );
340339
341340 // There's no job to log the gauges.
342341 assertThat (fakeScheduledExecutorService .isEmpty ()).isTrue ();
@@ -378,7 +377,7 @@ public void testUpdateAppStateHandlesMultipleAppStates() {
378377 fakeSession .setGaugeAndEventCollectionEnabled (true );
379378 testGaugeManager .setApplicationProcessState (ApplicationProcessState .FOREGROUND );
380379 testGaugeManager .startCollectingGauges (fakeSession );
381- GaugeCounter .setGaugeManager (testGaugeManager );
380+ GaugeCounter .INSTANCE . setGaugeManager (testGaugeManager );
382381
383382 // Generate metrics that don't exceed the GaugeCounter.MAX_COUNT.
384383 generateMetricsAndIncrementCounter (10 );
@@ -430,7 +429,7 @@ public void testGaugeManagerHandlesMultipleSessionIds() {
430429 fakeSession .setGaugeAndEventCollectionEnabled (true );
431430 testGaugeManager .setApplicationProcessState (ApplicationProcessState .BACKGROUND );
432431 testGaugeManager .startCollectingGauges (fakeSession );
433- GaugeCounter .setGaugeManager (testGaugeManager );
432+ GaugeCounter .INSTANCE . setGaugeManager (testGaugeManager );
434433
435434 // Generate metrics that don't exceed the GaugeCounter.MAX_COUNT.
436435 generateMetricsAndIncrementCounter (10 );
@@ -520,7 +519,7 @@ public void testStopCollectingGaugesCreatesOneLastJobToConsumeAnyPendingMetrics(
520519 + recordedGaugeMetric .getCpuMetricReadingsCount ();
521520 assertThat (recordedGaugeMetricsCount ).isEqualTo (2 );
522521
523- // TODO(b/394127311): Investigate why this isn't 0.
522+ // TODO(b/394127311): Investigate why this isn't 0 on local runs .
524523 // assertThat(GaugeCounter.INSTANCE.count()).isEqualTo(0);
525524 }
526525
0 commit comments