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

Commit a0d654c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Promote/demote flicker tests"

parents b17eb917 184d33e1

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

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -83,7 +82,7 @@ class AppPairsTestCannotPairNonResizeableApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

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

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -87,7 +86,7 @@ class AppPairsTestSupportPairNonResizeableApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

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

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



import android.os.SystemClock

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -72,7 +71,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @Postsubmit

    @Presubmit

    @Test

    override fun statusBarLayerRotatesScales() {

        // This test doesn't work in shell transitions because of b/206753786

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

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -87,7 +86,7 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
        testSpec.appPairsPrimaryBoundsIsVisibleAtEnd(testSpec.endRotation,

            primaryApp.component)



    @Postsubmit

    @Presubmit

    @Test

    fun appPairsSecondaryBoundsIsVisibleAtEnd() =

        testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation,

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

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -89,13 +88,13 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun appPairsPrimaryBoundsIsVisibleAtEnd() =

        testSpec.appPairsPrimaryBoundsIsVisibleAtEnd(testSpec.endRotation,

            primaryApp.component)



    @Postsubmit

    @Presubmit

    @Test

    fun appPairsSecondaryBoundsIsVisibleAtEnd() =

        testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation,