Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44765a6a authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Enable close app (with back or home) tests"

parents f69a2992 8989a880

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker.close



import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry
@@ -50,6 +51,7 @@ import org.junit.runners.Parameterized 
 * Test app closes by pressing back button

 * To run this test: `atest FlickerTests:CloseAppBackButtonTest`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -93,7 +95,7 @@ class CloseAppBackButtonTest( 
                        windowManagerTrace {

                            navBarWindowIsAlwaysVisible()

                            statusBarWindowIsAlwaysVisible()

                            visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 174635878)

                            visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173684672)



                            launcherReplacesAppWindowAsTopWindow(testApp)

                            wallpaperWindowBecomesVisible()
@@ -110,7 +112,7 @@ class CloseAppBackButtonTest( 
                                enabled = !configuration.startRotation.isRotated())

                            navBarLayerIsAlwaysVisible()

                            statusBarLayerIsAlwaysVisible()

                            visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 174635878)

                            visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173684672)



                            wallpaperLayerReplacesAppLayer(testApp)

                        }

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker.close



import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry
@@ -49,6 +50,7 @@ import org.junit.runners.Parameterized 
 * Test app closes by pressing home button.

 * To run this test: `atest FlickerTests:CloseAppHomeButtonTest`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -92,7 +94,7 @@ class CloseAppHomeButtonTest( 
                        windowManagerTrace {

                            navBarWindowIsAlwaysVisible()

                            statusBarWindowIsAlwaysVisible()

                            visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 174635878)

                            visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173689015)



                            launcherReplacesAppWindowAsTopWindow(testApp)

                            wallpaperWindowBecomesVisible()
@@ -108,7 +110,7 @@ class CloseAppHomeButtonTest( 
                                Surface.ROTATION_0, enabled = isRotation0)

                            navBarLayerIsAlwaysVisible()

                            statusBarLayerIsAlwaysVisible()

                            visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 174635878)

                            visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173689015)



                            wallpaperLayerReplacesAppLayer(testApp)

                        }