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

Commit 86e546f9 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes I0fadc918,I755ea2ef,I86706656 into main 

* changes:
  Mark flaky tests in HorizontalSplitChangeRatioTest as flaky
  Only dismiss tasks in SplitScreenBase setup if there are task to dismiss
  Mark AutoEnterPipOnGoToHomeTest#pipLayerReduces as flaky
parents f0545c1e ddc3e915

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : 
        }

    }



    @Presubmit

    @FlakyTest(bugId = 293133362)

    @Test

    override fun pipLayerReduces() {

        flicker.assertLayers {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/benchmark/SplitScreenBase.kt

+3 −1
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ abstract class SplitScreenBase(flicker: LegacyFlickerTest) : BaseBenchmarkTest(f 
            tapl.setEnableRotation(true)

            setRotation(flicker.scenario.startRotation)

            tapl.setExpectedRotation(flicker.scenario.startRotation.value)

            if (tapl.workspace.switchToOverview().hasTasks()) {

                tapl.workspace.switchToOverview().dismissAllTasks()

            }

        }

    }



    protected open val defaultTeardown: FlickerBuilder.() -> Unit = {

        teardown {

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/ActivityEmbeddingTestBase.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ abstract class ActivityEmbeddingTestBase(flicker: LegacyFlickerTest) : BaseTest( 
    /** Asserts the background animation layer is never visible during bounds change transition. */

    @Presubmit

    @Test

    fun backgroundLayerNeverVisible() {

    open fun backgroundLayerNeverVisible() {

        val backgroundColorLayer = ComponentNameMatcher("", "Animation Background")

        flicker.assertLayers {

            isInvisible(backgroundColorLayer)

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker.activityembedding



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.common.datatypes.Rect

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -65,6 +66,13 @@ class HorizontalSplitChangeRatioTest(flicker: LegacyFlickerTest) : 
        }

    }



    @FlakyTest(bugId = 293075402)

    override fun backgroundLayerNeverVisible() = super.backgroundLayerNeverVisible()



    @FlakyTest(bugId = 293075402)

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** Assert the Main activity window is always visible. */

    @Presubmit

    @Test