From 5c1f0b693ea7e44a022fa19122002b6b2b3d606f Mon Sep 17 00:00:00 2001 From: Antonella Dellanzo Date: Mon, 26 Oct 2020 10:00:57 +0100 Subject: [PATCH] Disabling status bar & navbar assertions in tests Disabling OpenAppColdTest, OpenAppWarmTest, CloseImeAutoOpenWindowToHomeTest and CloseImeWindowToHomeTest assertions regarding nav bar and status bar always visible as seems to be failing. Bug: b/12912591 b/12912587 Test: atest FlickerTests:CloseImeWindowToHomeTest FlickerTests:CloseImeAutoOpenWindowToHomeTest FlickerTests:OpenAppColdTest FlickerTests:OpenAppWarmTest Change-Id: I87c3d8270072a2039ea530a31a17f01aa70daeff --- .../wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt | 6 ++---- .../server/wm/flicker/ime/CloseImeWindowToHomeTest.kt | 6 ++---- .../com/android/server/wm/flicker/launch/OpenAppColdTest.kt | 6 ++---- .../com/android/server/wm/flicker/launch/OpenAppWarmTest.kt | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index 9924931431796..6cc2e2236127b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -100,10 +100,8 @@ class CloseImeAutoOpenWindowToHomeTest( Surface.ROTATION_0, bugId = 140855415) statusBarLayerRotatesScales(configuration.startRotation, Surface.ROTATION_0) - navBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) - statusBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) imeLayerBecomesInvisible(bugId = 141458352) imeAppLayerBecomesInvisible(testApp, bugId = 153739621) } 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 46f584b51e8c7..8d9881ec2063c 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 @@ -106,10 +106,8 @@ class CloseImeWindowToHomeTest( Surface.ROTATION_0, bugId = 140855415) statusBarLayerRotatesScales(configuration.startRotation, Surface.ROTATION_0) - navBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) - statusBarLayerIsAlwaysVisible(configuration.startRotation != - Surface.ROTATION_0) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) imeLayerBecomesInvisible(bugId = 153739621) imeAppLayerBecomesInvisible(testApp, bugId = 153739621) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 1194933ee3157..ad23d9f48568e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -100,10 +100,8 @@ class OpenAppColdTest( configuration.endRotation) statusBarLayerRotatesScales(Surface.ROTATION_0, configuration.endRotation) - navBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) - statusBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible(testApp) } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 136be29e421dd..5886a61eed349 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -104,10 +104,8 @@ class OpenAppWarmTest( configuration.endRotation) statusBarLayerRotatesScales(Surface.ROTATION_0, configuration.endRotation) - navBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) - statusBarLayerIsAlwaysVisible(Surface.ROTATION_0 != - configuration.endRotation) + navBarLayerIsAlwaysVisible(enabled = false) + statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible(testApp) }