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

Commit b19dbe2e authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Add corner radius at end assertion 

Add an assertion to relevant PiP
flicker tests involving a PiP transition
that checks for a non-zero corner radius
at the final trace's layer level.

Currently adding the assertion to be in Postsubmit.
Also overriding the assertion for not appplciable tests,
such as ExitPipToAppTransition subclasses.

Bug: 240167840
Flag: EXEMPT bugfix
Test: atest WMShellFlickerTestsPip
Change-Id: Ifba1fc93aa465d579920b0f6e5f9432ee0dda254
parent 3bc44be9

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

+7 −0
Original line number Diff line number Diff line
@@ -181,6 +181,13 @@ class PipDragThenSnapTest(flicker: LegacyFlickerTest) : PipTransition(flicker) { 
        super.taskBarWindowIsAlwaysVisible()

    }



    // Overridden to remove @Postsubmit annotation

    @Test

    @FlakyTest(bugId = 294993100)

    override fun pipLayerHasCorrectCornersAtEnd() {

        // No rounded corners as we go back to fullscreen in new orientation.

    }



    companion object {

        /**

         * Creates the test configurations.

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

+6 −0
Original line number Diff line number Diff line
@@ -147,6 +147,12 @@ open class SetRequestedOrientationWhilePinned(flicker: LegacyFlickerTest) : PipT 
    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    @Postsubmit

    @Test

    override fun pipLayerHasCorrectCornersAtEnd() {

        flicker.assertLayersEnd { hasNoRoundedCorners(pipApp) }

    }



    companion object {

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

        @JvmStatic

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

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ abstract class ClosePipTransition(flicker: LegacyFlickerTest) : PipTransition(fl 
        }

    }



    @Test

    override fun pipLayerHasCorrectCornersAtEnd() {

        // PiP might have completely faded out by this point, so corner radii not applicable.

    }



    companion object {

        /**

         * Creates the test configurations.

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

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


package com.android.wm.shell.flicker.pip.common



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.Rotation

import android.tools.flicker.legacy.LegacyFlickerTest
@@ -123,6 +124,12 @@ abstract class ExitPipToAppTransition(flicker: LegacyFlickerTest) : PipTransitio 
        }

    }



    @Postsubmit

    @Test

    override fun pipLayerHasCorrectCornersAtEnd() {

        flicker.assertLayersEnd { hasNoRoundedCorners(pipApp) }

    }



    /** {@inheritDoc} */

    @Presubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()

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

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip.common 


import android.app.Instrumentation

import android.content.Intent

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.Rotation

import android.tools.flicker.legacy.FlickerBuilder
@@ -105,4 +106,10 @@ abstract class PipTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) { 
                .doesNotContain(false)

        }

    }



    @Postsubmit

    @Test

    open fun pipLayerHasCorrectCornersAtEnd() {

        flicker.assertLayersEnd { hasRoundedCorners(pipApp) }

    }

}