|
20 | 20 | import static org.mockito.Mockito.doAnswer;
|
21 | 21 | import static org.mockito.Mockito.doNothing;
|
22 | 22 | import static org.mockito.Mockito.doReturn;
|
23 |
| -import static org.mockito.Mockito.inOrder; |
24 | 23 | import static org.mockito.Mockito.mock;
|
25 | 24 | import static org.mockito.Mockito.spy;
|
26 | 25 | import static org.mockito.Mockito.times;
|
|
31 | 30 | import android.os.Bundle;
|
32 | 31 | import android.util.SparseIntArray;
|
33 | 32 | import android.view.WindowManager;
|
34 |
| - |
35 | 33 | import androidx.appcompat.app.AppCompatActivity;
|
36 | 34 | import androidx.core.app.FrameMetricsAggregator;
|
37 | 35 | import androidx.fragment.app.Fragment;
|
|
55 | 53 | import org.junit.runner.RunWith;
|
56 | 54 | import org.mockito.ArgumentCaptor;
|
57 | 55 | import org.mockito.Captor;
|
58 |
| -import org.mockito.InOrder; |
59 | 56 | import org.mockito.Mock;
|
60 | 57 | import org.mockito.stubbing.Answer;
|
61 | 58 | import org.robolectric.Robolectric;
|
@@ -199,9 +196,7 @@ public void lifecycleCallbacks_onPausedCalledBeforeOnResume_doesNotLogFragmentSc
|
199 | 196 | 3, (long) metric.getCountersMap().get(Constants.CounterNames.FRAMES_FROZEN.toString()));
|
200 | 197 | }
|
201 | 198 |
|
202 |
| - /** |
203 |
| - * Simulate call order of activity + fragment lifecycle events |
204 |
| - */ |
| 199 | + /** Simulate call order of activity + fragment lifecycle events */ |
205 | 200 | @Test
|
206 | 201 | public void lifecycleCallbacks_cleansUpMap_duringActivityTransitions() {
|
207 | 202 | Bundle savedInstanceState = mock(Bundle.class);
|
@@ -260,45 +255,19 @@ public void fragmentTraceCreation_dropsTrace_whenFragmentNameTooLong() {
|
260 | 255 | verify(mockTransportManager, times(0)).log(any(TraceMetric.class), any());
|
261 | 256 | }
|
262 | 257 |
|
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 |
| - |
289 | 258 | private static Activity createFakeActivity(boolean isHardwareAccelerated) {
|
290 | 259 | ActivityController<Activity> fakeActivityController = Robolectric.buildActivity(Activity.class);
|
291 | 260 |
|
292 | 261 | if (isHardwareAccelerated) {
|
293 | 262 | fakeActivityController
|
294 |
| - .get() |
295 |
| - .getWindow() |
296 |
| - .addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); |
| 263 | + .get() |
| 264 | + .getWindow() |
| 265 | + .addFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); |
297 | 266 | } else {
|
298 | 267 | fakeActivityController
|
299 |
| - .get() |
300 |
| - .getWindow() |
301 |
| - .clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); |
| 268 | + .get() |
| 269 | + .getWindow() |
| 270 | + .clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); |
302 | 271 | }
|
303 | 272 |
|
304 | 273 | return fakeActivityController.start().get();
|
|
0 commit comments