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

Commit 7ade3e1c authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Enable flicker test group2 with Shell transition"

parents c5ddd0e0 47d77769

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

+1 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 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
@@ -41,7 +40,6 @@ 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
@@ -112,11 +110,7 @@ class LegacySplitScreenToLauncher( 


    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

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

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

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

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

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

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

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

import com.android.server.wm.flicker.helpers.setRotation
@@ -45,7 +44,6 @@ 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

import com.android.wm.shell.flicker.testapp.Components

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -137,11 +135,7 @@ class ResizeLegacySplitScreen( 


    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Test

    fun topAppLayerIsAlwaysVisible() {

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

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -35,7 +34,6 @@ import com.android.server.wm.flicker.statusBarWindowIsVisible 
import com.android.wm.shell.flicker.dockedStackDividerIsVisibleAtEnd

import com.android.wm.shell.flicker.dockedStackPrimaryBoundsIsVisibleAtEnd

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -79,11 +77,7 @@ class RotateOneLaunchedAppAndEnterSplitScreen( 


    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

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

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales
@@ -35,7 +34,6 @@ import com.android.server.wm.flicker.statusBarWindowIsVisible 
import com.android.wm.shell.flicker.dockedStackDividerIsVisibleAtEnd

import com.android.wm.shell.flicker.dockedStackPrimaryBoundsIsVisibleAtEnd

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -78,11 +76,7 @@ class RotateOneLaunchedAppInSplitScreenMode( 


    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

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

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

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

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

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

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

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

import com.android.server.wm.flicker.helpers.setRotation
@@ -37,7 +36,6 @@ import com.android.wm.shell.flicker.dockedStackDividerIsVisibleAtEnd 
import com.android.wm.shell.flicker.dockedStackPrimaryBoundsIsVisibleAtEnd

import com.android.wm.shell.flicker.dockedStackSecondaryBoundsIsVisibleAtEnd

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -88,11 +86,7 @@ class RotateTwoLaunchedAppAndEnterSplitScreen( 


    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test