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

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

Merge changes Icf637f09,Ibae3c102,I9758fc10,Ic4a53d96 

* changes:
  Extract out rotationLayerAppearsAndVanishes assertions
  Demote flaky transitions
  Update FlakyTest annotation to correct package
  Remove redundant tests
parents 8dc59320 eb773ab8

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

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


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



import android.platform.test.annotations.FlakyTest

import androidx.test.filters.FlakyTest

import android.platform.test.annotations.RequiresDevice

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

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

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

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


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



import android.platform.test.annotations.FlakyTest

import androidx.test.filters.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

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

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

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

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

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

import com.android.server.wm.flicker.traces.region.RegionSubject

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -58,6 +61,11 @@ import org.junit.runners.Parameterized 
open class MovePipDownShelfHeightChangeTest(

    testSpec: FlickerTestParameter

) : MovePipShelfHeightTransition(testSpec) {

    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    /**

     * Defines the transition used to run the test

     */

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

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


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



import android.platform.test.annotations.FlakyTest

import androidx.test.filters.FlakyTest

import android.platform.test.annotations.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -58,7 +58,7 @@ class MovePipDownShelfHeightChangeTest_ShellTransit( 
    testSpec: FlickerTestParameter

) : MovePipDownShelfHeightChangeTest(testSpec) {

    @Before

    fun before() {

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

    }

}

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

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


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



import android.platform.test.annotations.FlakyTest

import androidx.test.filters.FlakyTest

import android.platform.test.annotations.RequiresDevice

import android.view.Surface

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