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

Commit d249ad62 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky legacy split screen flicker tests" into sc-dev am: a3e28dec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14231759

Change-Id: I930dfc0f4ef24390d60f92481a8a83ef04971079
parents 0fd3bb14 a3e28dec

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt

+0 −12
Original line number Diff line number Diff line
@@ -74,12 +74,6 @@ class EnterSplitScreenDockActivity( 
    @Test

    fun dockedStackDividerBecomesVisible() = testSpec.dockedStackDividerBecomesVisible()



    @FlakyTest(bugId = 178531736)

    @Test

    // b/178531736

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()
@@ -88,12 +82,6 @@ class EnterSplitScreenDockActivity( 
    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @FlakyTest(bugId = 178531736)

    @Test

    // b/178531736

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    fun appWindowIsVisible() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt

+0 −12
Original line number Diff line number Diff line
@@ -83,13 +83,6 @@ class EnterSplitScreenLaunchToSide( 
    // b/169271943

    fun dockedStackDividerBecomesVisible() = testSpec.dockedStackDividerBecomesVisible()



    @FlakyTest(bugId = 178447631)

    @Test

    // TODO(b/178447631) Remove Splash Screen from white list when flicker lib

    //                   add a wait for splash screen be gone

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp.defaultWindowName)
@@ -102,11 +95,6 @@ class EnterSplitScreenLaunchToSide( 
    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenNotSupportNonResizable.kt

+0 −17
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.legacysplitscreen 
import android.platform.test.annotations.Postsubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -97,25 +96,9 @@ class EnterSplitScreenNotSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @FlakyTest(bugId = 178447631)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @Test

    fun dockedStackDividerIsInvisible() = testSpec.dockedStackDividerIsInvisible()



    @Test

    fun appWindowIsVisible() {

        testSpec.assertWmEnd {

            isInvisible(nonResizeableApp.defaultWindowName)

        }

    }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenSupportNonResizable.kt

+0 −10
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.legacysplitscreen 
import android.platform.test.annotations.Postsubmit

import android.provider.Settings

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -92,15 +91,6 @@ class EnterSplitScreenSupportNonResizable( 
                prevSupportNonResizableInMultiWindow)

    }



    @FlakyTest(bugId = 178447631)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

            super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

            super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @Test

    fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt

+0 −11
Original line number Diff line number Diff line
@@ -78,12 +78,6 @@ class ExitLegacySplitScreenFromBottom( 
    @Test

    fun layerBecomesInvisible() = testSpec.layerBecomesInvisible(DOCKED_STACK_DIVIDER)



    @FlakyTest(bugId = 178447631)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest

    @Test

    fun appWindowBecomesInVisible() =
@@ -97,11 +91,6 @@ class ExitLegacySplitScreenFromBottom( 
    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @FlakyTest(bugId = 178447631)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic