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

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

Merge "Disable tests not compatible with current shell transitions"

parents b2182915 7fdad8f9

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

+7 −1
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group1

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

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

import com.android.wm.shell.flicker.appPairsDividerIsInvisibleAtEnd

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

import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.resetMultiWindowConfig

import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.setSupportsNonResizableMultiWindow

import org.junit.After

import org.junit.Assume.assumeFalse

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test
@@ -82,7 +84,11 @@ class AppPairsTestCannotPairNonResizeableApps( 


    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    @Presubmit

    @Test

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

+7 −1
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group1

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

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

import com.android.wm.shell.flicker.APP_PAIR_SPLIT_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.appPairsDividerIsVisibleAtEnd

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

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -67,7 +69,11 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 


    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    @Presubmit

    @Test

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

+7 −1
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group1

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

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

import com.android.wm.shell.flicker.appPairsDividerIsVisibleAtEnd

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

import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.resetMultiWindowConfig

import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.setSupportsNonResizableMultiWindow

import org.junit.After

import org.junit.Assume.assumeFalse

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test
@@ -86,7 +88,11 @@ class AppPairsTestSupportPairNonResizeableApps( 


    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    @Presubmit

    @Test

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

+7 −1
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group1

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

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

import com.android.wm.shell.flicker.APP_PAIR_SPLIT_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.appPairsDividerIsInvisibleAtEnd

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

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -71,7 +73,11 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 


    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    @Presubmit

    @Test

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

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.server.wm.flicker.annotation.Group2 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.entireScreenCovered

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

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

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

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

import com.android.server.wm.flicker.helpers.setRotation
@@ -40,6 +41,7 @@ import com.android.server.wm.flicker.statusBarWindowIsVisible 
import com.android.server.wm.traces.common.FlickerComponentName

import com.android.wm.shell.flicker.dockedStackDividerBecomesInvisible

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -110,7 +112,11 @@ class LegacySplitScreenToLauncher( 


    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }



    @Presubmit

    @Test