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

Commit ea34fde7 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes I98fce6ec,I04c3eb15 

* changes:
  Promote stable Flicker tests
  Add isTablet assumption to navBarLayerIsInvisibleInLandscapeGestural
parents 35048ac0 45b62d4b

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt

+0 −67
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.bubble

package com.android.wm.shell.flicker.bubble





import android.os.SystemClock

import android.os.SystemClock

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import androidx.test.uiautomator.By

import androidx.test.uiautomator.By
@@ -90,70 +89,4 @@ open class MultiBubblesScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen 
            this.isVisible(testApp)

            this.isVisible(testApp)

        }

        }

    }

    }



    /** {@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()

}
 
}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt

+4 −57
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.wm.shell.flicker.pip

package com.android.wm.shell.flicker.pip





import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -83,6 +83,7 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest( 
            }

            }

        }

        }





    @FlakyTest

    @Test

    @Test

    override fun pipLayerReduces() {

    override fun pipLayerReduces() {

        testSpec.assertLayers {

        testSpec.assertLayers {
@@ -96,6 +97,7 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest( 
    /**

    /**

     * Checks that [pipApp] window is animated towards default position in right bottom corner

     * Checks that [pipApp] window is animated towards default position in right bottom corner

     */

     */

    @Presubmit

    @Test

    @Test

    fun pipLayerMovesTowardsRightBottomCorner() {

    fun pipLayerMovesTowardsRightBottomCorner() {

        // in gestural nav the swipe makes PiP first go upwards

        // in gestural nav the swipe makes PiP first go upwards
@@ -111,66 +113,11 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest( 
        }

        }

    }

    }





    @Presubmit

    @Test

    @Test

    override fun focusChanges() {

    override fun focusChanges() {

        // in gestural nav the focus goes to different activity on swipe up

        // in gestural nav the focus goes to different activity on swipe up

        Assume.assumeFalse(testSpec.isGesturalNavigation)

        Assume.assumeFalse(testSpec.isGesturalNavigation)

        super.focusChanges()

        super.focusChanges()

    }

    }



    @Postsubmit

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun pipAppLayerAlwaysVisible() = super.pipAppLayerAlwaysVisible()



    @Postsubmit

    @Test

    override fun pipLayerRemainInsideVisibleBounds() = super.pipLayerRemainInsideVisibleBounds()



    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

}
 
}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt

+4 −10
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.pip

package com.android.wm.shell.flicker.pip





import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice
@@ -81,7 +80,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
            }

            }

        }

        }





    @Postsubmit

    @Presubmit

    @Test

    @Test

    override fun pipAppLayerAlwaysVisible() {

    override fun pipAppLayerAlwaysVisible() {

        if (!testSpec.isGesturalNavigation) super.pipAppLayerAlwaysVisible() else {

        if (!testSpec.isGesturalNavigation) super.pipAppLayerAlwaysVisible() else {
@@ -94,7 +93,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
        }

        }

    }

    }





    @Postsubmit

    @Presubmit

    @Test

    @Test

    override fun pipLayerReduces() {

    override fun pipLayerReduces() {

        // in gestural nav the pip enters through alpha animation

        // in gestural nav the pip enters through alpha animation
@@ -102,7 +101,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
        super.pipLayerReduces()

        super.pipLayerReduces()

    }

    }





    @Postsubmit

    @Presubmit

    @Test

    @Test

    override fun focusChanges() {

    override fun focusChanges() {

        // in gestural nav the focus goes to different activity on swipe up

        // in gestural nav the focus goes to different activity on swipe up
@@ -110,11 +109,6 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
        super.focusChanges()

        super.focusChanges()

    }

    }





    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun pipAppWindowAlwaysVisible() = super.pipAppWindowAlwaysVisible()



    @Presubmit

    @Presubmit

    @Test

    @Test

    override fun entireScreenCovered() {

    override fun entireScreenCovered() {
@@ -129,7 +123,7 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
        super.entireScreenCovered()

        super.entireScreenCovered()

    }

    }





    @Postsubmit

    @Presubmit

    @Test

    @Test

    override fun pipLayerRemainInsideVisibleBounds() {

    override fun pipLayerRemainInsideVisibleBounds() {

        if (!testSpec.isGesturalNavigation) super.pipLayerRemainInsideVisibleBounds() else {

        if (!testSpec.isGesturalNavigation) super.pipLayerRemainInsideVisibleBounds() else {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+0 −5
Original line number Original line Diff line number Diff line
@@ -231,11 +231,6 @@ class EnterPipToOtherOrientationTest( 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.visibleLayersShownMoreThanOneConsecutiveEntry()





    /** {@inheritDoc}  */

    @FlakyTest(bugId = 227313015)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

    companion object {

        /**

        /**

         * Creates the test configurations.

         * Creates the test configurations.

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt

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




package com.android.wm.shell.flicker.pip

package com.android.wm.shell.flicker.pip





import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.Surface

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -90,63 +89,4 @@ abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition 
                .isVisible(LAUNCHER)

                .isVisible(LAUNCHER)

        }

        }

    }

    }



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc}  */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()

}
 
}