Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "De-flake testSystemDrivenInsetsAnimationLoggingListener_onReady" into tm-qpr-dev

Browse Source
This commit is contained in:
Austin Borger
2023-07-11 16:27:11 +00:00
committed by Android (Google) Code Review
parent e326cb83e8 c3dc5d5857
commit a44bc9caff
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/tests/coretests/src/android/view/InsetsControllerTest.java
View File

@@ -237,17 +237,22 @@ public class InsetsControllerTest {
@Test @Test
public void testSystemDrivenInsetsAnimationLoggingListener_onReady() { public void testSystemDrivenInsetsAnimationLoggingListener_onReady() {
var loggingListener = mock(WindowInsetsAnimationControlListener.class);
prepareControls(); prepareControls();
// only the original thread that created view hierarchy can touch its views // only the original thread that created view hierarchy can touch its views
InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
WindowInsetsAnimationControlListener loggingListener =
mock(WindowInsetsAnimationControlListener.class);
mController.setSystemDrivenInsetsAnimationLoggingListener(loggingListener); mController.setSystemDrivenInsetsAnimationLoggingListener(loggingListener);
mController.getSourceConsumer(ITYPE_IME).onWindowFocusGained(true); mController.getSourceConsumer(ITYPE_IME).onWindowFocusGained(true);
// since there is no focused view, forcefully make IME visible. // since there is no focused view, forcefully make IME visible.
mController.show(Type.ime(), true /* fromIme */); mController.show(WindowInsets.Type.ime(), true /* fromIme */);
verify(loggingListener).onReady(notNull(), anyInt()); // When using the animation thread, this must not invoke onReady()
mViewRoot.getView().getViewTreeObserver().dispatchOnPreDraw();
}); });
// Wait for onReady() being dispatched on the animation thread.
InsetsAnimationThread.get().getThreadHandler().runWithScissors(() -> {}, 500);
verify(loggingListener).onReady(notNull(), anyInt());
} }
@Test @Test