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

Commit bfc834ee authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Generalize apppairs assertions" into sc-dev

parents b65bb588 8cbe35fa

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

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


import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -59,6 +60,14 @@ class AppPairsTestCannotPairNonResizeableApps( 
            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible()

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

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,14 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun appPairsDividerIsVisible() = testSpec.appPairsDividerIsVisible()

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

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,14 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible()

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

+30 −4
Original line number Diff line number Diff line
@@ -20,19 +20,23 @@ import android.app.Instrumentation 
import android.platform.test.annotations.Presubmit

import android.system.helpers.ActivityHelper

import android.util.Log

import android.view.Surface

import androidx.test.platform.app.InstrumentationRegistry

import com.android.compatibility.common.util.SystemUtil

import com.android.server.wm.flicker.FlickerBuilderProvider

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

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

import com.android.server.wm.flicker.endRotation

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

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

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

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

import com.android.wm.shell.flicker.helpers.SplitScreenHelper
@@ -134,17 +138,39 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) 


    @Presubmit

    @Test

    open fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()

    open fun navBarLayerIsAlwaysVisible() {

        testSpec.navBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

        testSpec.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() {

        testSpec.navBarWindowIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()

    open fun statusBarWindowIsAlwaysVisible() {

        testSpec.statusBarWindowIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()

    open fun navBarLayerRotatesAndScales() {

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0,

            testSpec.config.endRotation)

    }



    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

    open fun statusBarLayerRotatesScales() {

        testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0,

            testSpec.config.endRotation)

    }

}
 
 No newline at end of file

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

+0 −12
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

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

import com.android.wm.shell.flicker.appPairsDividerIsVisible

import com.android.wm.shell.flicker.appPairsPrimaryBoundsIsVisible

import com.android.wm.shell.flicker.appPairsSecondaryBoundsIsVisible
@@ -75,16 +73,6 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
    @Test

    fun appPairsDividerIsVisible() = testSpec.appPairsDividerIsVisible()



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0,

        testSpec.config.endRotation)



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0,

        testSpec.config.endRotation)



    @FlakyTest(bugId = 172776659)

    @Test

    fun appPairsPrimaryBoundsIsVisible() =