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

Commit 79315379 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update tests to reflect region based assertion changes 

Bug: 204894659
Test: atest FlickerTests WMShellFlickerTests FlickerLibTest
Change-Id: Ib82953da0f52953046cf2d5f717c9dc11f221a93
parent 0f75b8e3

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

+1 −1
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
@file:JvmName("CommonAssertions")

package com.android.wm.shell.flicker



import android.graphics.Region

import android.view.Surface

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.traces.common.FlickerComponentName

import com.android.server.wm.traces.common.region.Region



fun FlickerTestParameter.appPairsDividerIsVisibleAtEnd() {

    assertLayersEnd {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/AppPairsHelper.kt

+3 −3
Original line number Diff line number Diff line
@@ -17,23 +17,23 @@ 
package com.android.wm.shell.flicker.helpers



import android.app.Instrumentation

import android.graphics.Region

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.traces.common.FlickerComponentName

import com.android.server.wm.traces.common.region.Region



class AppPairsHelper(

    instrumentation: Instrumentation,

    activityLabel: String,

    component: FlickerComponentName

) : BaseAppHelper(instrumentation, activityLabel, component) {

    fun getPrimaryBounds(dividerBounds: Region): android.graphics.Region {

    fun getPrimaryBounds(dividerBounds: Region): Region {

        val primaryAppBounds = Region(0, 0, dividerBounds.bounds.right,

                dividerBounds.bounds.bottom + WindowUtils.dockedStackDividerInset)

        return primaryAppBounds

    }



    fun getSecondaryBounds(dividerBounds: Region): android.graphics.Region {

    fun getSecondaryBounds(dividerBounds: Region): Region {

        val displayBounds = WindowUtils.displayBounds

        val secondaryAppBounds = Region(0,

                dividerBounds.bounds.bottom - WindowUtils.dockedStackDividerInset,

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.helpers



import android.app.Instrumentation

import android.graphics.Rect

import android.media.session.MediaController

import android.media.session.MediaSessionManager

import android.os.SystemClock
@@ -26,6 +25,7 @@ import androidx.test.uiautomator.BySelector 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.helpers.FIND_TIMEOUT

import com.android.server.wm.flicker.helpers.SYSTEMUI_PACKAGE

import com.android.server.wm.traces.common.Rect

import com.android.server.wm.traces.parser.toFlickerComponent

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import com.android.wm.shell.flicker.pip.tv.closeTvPipWindow

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

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


package com.android.wm.shell.flicker.legacysplitscreen



import android.graphics.Region

import android.util.Rational

import android.view.Surface

import androidx.test.filters.FlakyTest
@@ -41,6 +40,7 @@ import com.android.server.wm.flicker.navBarWindowIsVisible 
import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.traces.common.region.Region

import com.android.server.wm.traces.parser.toFlickerComponent

import com.android.wm.shell.flicker.DOCKED_STACK_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.helpers.SimpleAppHelper

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

+4 −4
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
    @Presubmit

    @Test

    fun pipWindowRemainInsideVisibleBounds() {

        testSpec.assertWm {

            coversAtMost(displayBounds, pipApp.component)

        testSpec.assertWmVisibleRegion(pipApp.component) {

            coversAtMost(displayBounds)

        }

    }
@@ -140,8 +140,8 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
    @Presubmit

    @Test

    fun pipLayerRemainInsideVisibleBounds() {

        testSpec.assertLayers {

            coversAtMost(displayBounds, pipApp.component)

        testSpec.assertLayersVisibleRegion(pipApp.component) {

            coversAtMost(displayBounds)

        }

    }