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

Commit 51178849 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Compatibilize tests with new constants 

Fixes: 255715397
Fixes: 259382394
Fixes: 259251690
Test: atest FlickerTest WMShellFlickerTests
Change-Id: I427f589af15896f54f18872f4781e4ff5842783f
parent 6aea00af

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

+17 −17
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


package com.android.wm.shell.flicker



import android.view.Surface

import com.android.server.wm.flicker.FlickerTest

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

import com.android.server.wm.flicker.traces.layers.LayerTraceEntrySubject

import com.android.server.wm.flicker.traces.layers.LayersTraceSubject

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

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

import com.android.server.wm.traces.common.service.PlatformConsts



fun FlickerTest.appPairsDividerIsVisibleAtEnd() {

    assertLayersEnd { this.isVisible(APP_PAIR_SPLIT_DIVIDER_COMPONENT) }
@@ -247,7 +247,7 @@ fun LayersTraceSubject.splitAppLayerBoundsSnapToDivider( 
    component: IComponentMatcher,

    landscapePosLeft: Boolean,

    portraitPosTop: Boolean,

    rotation: Int

    rotation: PlatformConsts.Rotation

): LayersTraceSubject {

    return invoke("splitAppLayerBoundsSnapToDivider") {

        it.splitAppLayerBoundsSnapToDivider(component, landscapePosLeft, portraitPosTop, rotation)
@@ -258,7 +258,7 @@ fun LayerTraceEntrySubject.splitAppLayerBoundsSnapToDivider( 
    component: IComponentMatcher,

    landscapePosLeft: Boolean,

    portraitPosTop: Boolean,

    rotation: Int

    rotation: PlatformConsts.Rotation

): LayerTraceEntrySubject {

    val displayBounds = WindowUtils.getDisplayBounds(rotation)

    return invoke {
@@ -367,7 +367,7 @@ fun FlickerTest.dockedStackDividerNotExistsAtEnd() { 
}



fun FlickerTest.appPairsPrimaryBoundsIsVisibleAtEnd(

    rotation: Int,

    rotation: PlatformConsts.Rotation,

    primaryComponent: IComponentMatcher

) {

    assertLayersEnd {
@@ -377,7 +377,7 @@ fun FlickerTest.appPairsPrimaryBoundsIsVisibleAtEnd( 
}



fun FlickerTest.dockedStackPrimaryBoundsIsVisibleAtEnd(

    rotation: Int,

    rotation: PlatformConsts.Rotation,

    primaryComponent: IComponentMatcher

) {

    assertLayersEnd {
@@ -387,7 +387,7 @@ fun FlickerTest.dockedStackPrimaryBoundsIsVisibleAtEnd( 
}



fun FlickerTest.appPairsSecondaryBoundsIsVisibleAtEnd(

    rotation: Int,

    rotation: PlatformConsts.Rotation,

    secondaryComponent: IComponentMatcher

) {

    assertLayersEnd {
@@ -397,7 +397,7 @@ fun FlickerTest.appPairsSecondaryBoundsIsVisibleAtEnd( 
}



fun FlickerTest.dockedStackSecondaryBoundsIsVisibleAtEnd(

    rotation: Int,

    rotation: PlatformConsts.Rotation,

    secondaryComponent: IComponentMatcher

) {

    assertLayersEnd {
@@ -406,38 +406,38 @@ fun FlickerTest.dockedStackSecondaryBoundsIsVisibleAtEnd( 
    }

}



fun getPrimaryRegion(dividerRegion: Region, rotation: Int): Region {

fun getPrimaryRegion(dividerRegion: Region, rotation: PlatformConsts.Rotation): Region {

    val displayBounds = WindowUtils.getDisplayBounds(rotation)

    return if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {

    return if (rotation.isRotated()) {

        Region.from(

            0,

            0,

            displayBounds.bounds.right,

            dividerRegion.bounds.top + WindowUtils.dockedStackDividerInset

            dividerRegion.bounds.left + WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.bottom

        )

    } else {

        Region.from(

            0,

            0,

            dividerRegion.bounds.left + WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.bottom

            displayBounds.bounds.right,

            dividerRegion.bounds.top + WindowUtils.dockedStackDividerInset

        )

    }

}



fun getSecondaryRegion(dividerRegion: Region, rotation: Int): Region {

fun getSecondaryRegion(dividerRegion: Region, rotation: PlatformConsts.Rotation): Region {

    val displayBounds = WindowUtils.getDisplayBounds(rotation)

    return if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {

    return if (rotation.isRotated()) {

        Region.from(

            dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset,

            0,

            dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.right,

            displayBounds.bounds.bottom

        )

    } else {

        Region.from(

            dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset,

            0,

            dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.right,

            displayBounds.bounds.bottom

        )

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.NotificationManager 
import android.content.Context

import android.content.pm.PackageManager

import android.os.ServiceManager

import android.view.Surface

import androidx.test.uiautomator.By

import androidx.test.uiautomator.UiObject2

import androidx.test.uiautomator.Until
@@ -31,6 +30,7 @@ import com.android.server.wm.flicker.FlickerTestFactory 
import com.android.server.wm.flicker.IFlickerTestData

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

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

import com.android.server.wm.traces.common.service.PlatformConsts

import com.android.wm.shell.flicker.BaseTest

import org.junit.runners.Parameterized
@@ -89,7 +89,7 @@ abstract class BaseBubbleScreen(flicker: FlickerTest) : BaseTest(flicker) { 
        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(Surface.ROTATION_0)

                supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)

            )

        }

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

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


import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder

import com.android.server.wm.flicker.FlickerTest
@@ -27,6 +26,7 @@ import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen 
import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test
@@ -73,7 +73,7 @@ class AutoEnterPipOnGoToHomeTest(flicker: FlickerTest) : EnterPipTest(flicker) { 
                // close gracefully so that onActivityUnpinned() can be called before force exit

                pipApp.closePipWindow(wmHelper)



                setRotation(Surface.ROTATION_0)

                setRotation(PlatformConsts.Rotation.ROTATION_0)

                RemoveAllTasksButHomeRule.removeAllTasksButHome()

                pipApp.exit(wmHelper)

            }

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

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



import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder

import com.android.server.wm.flicker.FlickerTest
@@ -25,6 +24,7 @@ import com.android.server.wm.flicker.helpers.setRotation 
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

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

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test
@@ -68,7 +68,7 @@ class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTest(flicker) 
                pipApp.enableEnterPipOnUserLeaveHint()

            }

            teardown {

                setRotation(Surface.ROTATION_0)

                setRotation(PlatformConsts.Rotation.ROTATION_0)

                RemoveAllTasksButHomeRule.removeAllTasksButHome()

                pipApp.exit(wmHelper)

            }

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

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



import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder

import com.android.server.wm.flicker.FlickerTest
@@ -27,6 +26,7 @@ import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen 
import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule

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

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -68,7 +68,7 @@ open class EnterPipTest(flicker: FlickerTest) : PipTransition(flicker) { 
                pipApp.launchViaIntent(wmHelper)

            }

            teardown {

                setRotation(Surface.ROTATION_0)

                setRotation(PlatformConsts.Rotation.ROTATION_0)

                RemoveAllTasksButHomeRule.removeAllTasksButHome()

                pipApp.exit(wmHelper)

            }
@@ -164,7 +164,7 @@ open class EnterPipTest(flicker: FlickerTest) : PipTransition(flicker) { 
        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(Surface.ROTATION_0)

                supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)

            )

        }

    }