Skip to content

Commit ef812f9

Browse files
committed
remove test that is already covered in FrameMetricsRecorderTest
1 parent 7d082f3 commit ef812f9

File tree

1 file changed

+7
-38
lines changed

1 file changed

+7
-38
lines changed

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

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mockito.Mockito.doAnswer;
2121
import static org.mockito.Mockito.doNothing;
2222
import static org.mockito.Mockito.doReturn;
23-
import static org.mockito.Mockito.inOrder;
2423
import static org.mockito.Mockito.mock;
2524
import static org.mockito.Mockito.spy;
2625
import static org.mockito.Mockito.times;
@@ -31,7 +30,6 @@
3130
import android.os.Bundle;
3231
import android.util.SparseIntArray;
3332
import android.view.WindowManager;
34-
3533
import androidx.appcompat.app.AppCompatActivity;
3634
import androidx.core.app.FrameMetricsAggregator;
3735
import androidx.fragment.app.Fragment;
@@ -55,7 +53,6 @@
5553
import org.junit.runner.RunWith;
5654
import org.mockito.ArgumentCaptor;
5755
import org.mockito.Captor;
58-
import org.mockito.InOrder;
5956
import org.mockito.Mock;
6057
import org.mockito.stubbing.Answer;
6158
import org.robolectric.Robolectric;
@@ -199,9 +196,7 @@ public void lifecycleCallbacks_onPausedCalledBeforeOnResume_doesNotLogFragmentSc
199196
3, (long) metric.getCountersMap().get(Constants.CounterNames.FRAMES_FROZEN.toString()));
200197
}
201198

202-
/**
203-
* Simulate call order of activity + fragment lifecycle events
204-
*/
199+
/** Simulate call order of activity + fragment lifecycle events */
205200
@Test
206201
public void lifecycleCallbacks_cleansUpMap_duringActivityTransitions() {
207202
Bundle savedInstanceState = mock(Bundle.class);
@@ -260,45 +255,19 @@ public void fragmentTraceCreation_dropsTrace_whenFragmentNameTooLong() {
260255
verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
261256
}
262257

263-
/************ FrameMetrics Collection Tests ****************/
264-
265-
@Test
266-
public void onFragmentPaused_processFrameMetrics_beforeReset() {
267-
// Simulate call order of activity + fragment lifecycle events
268-
AppStateMonitor appStateMonitor =
269-
spy(new AppStateMonitor(mockTransportManager, clock, configResolver, true));
270-
FragmentStateMonitor fragmentMonitor =
271-
new FragmentStateMonitor(clock, mockTransportManager, appStateMonitor, recorder);
272-
doReturn(true).when(configResolver).isPerformanceMonitoringEnabled();
273-
doReturn(true).when(appStateMonitor).isScreenTraceSupported();
274-
// Activity_A onCreate registers FragmentStateMonitor, then:
275-
appStateMonitor.onActivityStarted(activity);
276-
fragmentMonitor.onFragmentStarted(mockFragmentManager, mockFragment);
277-
appStateMonitor.onActivityResumed(activity);
278-
fragmentMonitor.onFragmentResumed(mockFragmentManager, mockFragment);
279-
appStateMonitor.onActivityPaused(activity);
280-
fragmentMonitor.onFragmentPaused(mockFragmentManager, mockFragment);
281-
appStateMonitor.onActivityStopped(activity);
282-
fragmentMonitor.onFragmentStopped(mockFragmentManager, mockFragment);
283-
// reset() is only called after fragment is done collecting its metrics
284-
InOrder orderVerifier = inOrder(recorder);
285-
orderVerifier.verify(recorder, times(1)).stopFragment(any());
286-
orderVerifier.verify(recorder, times(1)).stop();
287-
}
288-
289258
private static Activity createFakeActivity(boolean isHardwareAccelerated) {
290259
ActivityController<Activity> fakeActivityController = Robolectric.buildActivity(Activity.class);
291260

292261
if (isHardwareAccelerated) {
293262
fakeActivityController
294-
.get()
295-
.getWindow()
296-
.addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
263+
.get()
264+
.getWindow()
265+
.addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
297266
} else {
298267
fakeActivityController
299-
.get()
300-
.getWindow()
301-
.clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
268+
.get()
269+
.getWindow()
270+
.clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
302271
}
303272

304273
return fakeActivityController.start().get();

0 commit comments

Comments
 (0)