From 6429892ea96938dcd4387d5cc091ab12de8bfc5e Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Tue, 14 Jul 2020 21:57:42 +0200 Subject: [PATCH] Fix app window detection on WM traces Also, enable self check tests Test: atest FlickerTests Change-Id: Ic456b39702fe27bfa52e4bf856c22bb350a4dbf4 --- .../server/wm/flicker/ime/CloseImeWindowToHomeTest.kt | 6 +++--- .../com/android/server/wm/flicker/ime/OpenImeWindowTest.kt | 4 ++-- .../src/com/android/server/wm/flicker/pip/PipToAppTest.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index 7b155ebd93e18..ed8bd2a5fe83b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -55,9 +55,9 @@ open class CloseImeWindowToHomeTest( open fun checkVisibility_imeWindowBecomesInvisible() { checkResults { WmTraceSubject.assertThat(it) - .showsImeWindow(IME_WINDOW_TITLE) + .showsNonAppWindow(IME_WINDOW_TITLE) .then() - .hidesImeWindow(IME_WINDOW_TITLE) + .hidesNonAppWindow(IME_WINDOW_TITLE) .forAllEntries() } } @@ -96,7 +96,7 @@ open class CloseImeWindowToHomeTest( WmTraceSubject.assertThat(it) .showsAppWindowOnTop(testApp.getPackage()) .then() - .hidesAppWindowOnTop(testApp.getPackage()) + .appWindowNotOnTop(testApp.getPackage()) .forAllEntries() } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index 9885359a0fb7e..c7731f330aebd 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -54,9 +54,9 @@ class OpenImeWindowTest( checkResults { WmTraceSubject.assertThat(it) .skipUntilFirstAssertion() - .hidesImeWindow(IME_WINDOW_TITLE) + .hidesNonAppWindow(IME_WINDOW_TITLE) .then() - .showsImeWindow(IME_WINDOW_TITLE) + .showsNonAppWindow(IME_WINDOW_TITLE) .forAllEntries() } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt index bfececa72d4e6..f939a7915e74a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt @@ -58,7 +58,7 @@ class PipToAppTest( .then() .showsAppWindowOnTop(testApp.getPackage()) .then() - .hidesAppWindowOnTop(testApp.getPackage()) + .appWindowNotOnTop(testApp.getPackage()) .forAllEntries() } }