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

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

Merge "Promote passing split screen tests"

parents 3c5431cc f6502801

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

+0 −41
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice
@@ -116,46 +115,6 @@ class CopyContentInSplit(flicker: FlickerTest) : SplitScreenBase(flicker) { 
    /** {@inheritDoc} */

    @Presubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Presubmit

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

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


import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder
@@ -149,60 +148,9 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) { 
        )



    /** {@inheritDoc} */

    @Postsubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @FlakyTest(bugId = 263213649)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

        @Parameterized.Parameters(name = "{0}")

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

+3 −54
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerBuilder
@@ -126,60 +126,9 @@ class EnterSplitScreenByDragFromShortcut(flicker: FlickerTest) : SplitScreenBase 
    }



    /** {@inheritDoc} */

    @Postsubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @FlakyTest(bugId = 241523824)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

        @Parameterized.Parameters(name = "{0}")

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

+0 −62
Original line number Diff line number Diff line
@@ -18,13 +18,11 @@ package com.android.wm.shell.flicker.splitscreen 


import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

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

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

import com.android.server.wm.flicker.FlickerTestFactory

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

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

import com.android.wm.shell.flicker.appWindowBecomesVisible

import com.android.wm.shell.flicker.layerBecomesVisible
@@ -33,7 +31,6 @@ import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesVisible 
import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd

import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible

import com.android.wm.shell.flicker.splitScreenEntered

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -96,18 +93,6 @@ class EnterSplitScreenFromOverview(flicker: FlickerTest) : SplitScreenBase(flick 
    @Presubmit

    @Test

    fun secondaryAppBoundsBecomesVisible() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        flicker.splitAppLayerBoundsBecomesVisible(

            secondaryApp,

            landscapePosLeft = !tapl.isTablet,

            portraitPosTop = true

        )

    }



    @FlakyTest(bugId = 244407465)

    @Test

    fun secondaryAppBoundsBecomesVisible_shellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        flicker.splitAppLayerBoundsBecomesVisible(

            secondaryApp,

            landscapePosLeft = !tapl.isTablet,
@@ -128,59 +113,12 @@ class EnterSplitScreenFromOverview(flicker: FlickerTest) : SplitScreenBase(flick 
    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 252736515)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+0 −47
Original line number Diff line number Diff line
@@ -193,59 +193,12 @@ class SwitchAppByDoubleTapDivider(flicker: FlickerTest) : SplitScreenBase(flicke 
    /** {@inheritDoc} */

    @Postsubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic