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

Commit 70873fd6 authored by Chris Li's avatar Chris Li
Browse files

Enable flicker test group3 with Shell transition 

Bug: 214452854
Test: pass existing
Change-Id: Ia1a10ebaef3a058526be943194e15bf5b5a50ca6
parent 7ad5f5a2

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

+1 −7
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.LAUNCHER_COMPONENT

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.rules.WMFlickerServiceRuleForTestSpec

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test
@@ -93,11 +91,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /**

     * Checks [pipApp] window remains visible throughout the animation

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.traces.common.FlickerComponentName
@@ -36,7 +35,6 @@ import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Com 
import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_PORTRAIT

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

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

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -121,11 +119,7 @@ class EnterPipToOtherOrientationTest( 
     */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        testSpec.statusBarLayerRotatesScales()

    }

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that all parts of the screen are covered at the start and end of the transition

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

+0 −11
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ package com.android.wm.shell.flicker.pip 


import android.platform.test.annotations.Presubmit

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

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

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

import org.junit.Assume.assumeFalse

import org.junit.Test



/**
@@ -29,15 +27,6 @@ import org.junit.Test 
abstract class ExitPipToAppTransition(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    protected val testApp = FixedAppHelper(instrumentation)



    /** {@inheritDoc}  */

    @Presubmit

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }



    /**

     * Checks that the pip app window remains inside the display bounds throughout the whole

     * animation

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

+1 −7
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 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 org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -82,11 +80,7 @@ class ExitPipViaExpandButtonClickTest( 
    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    companion object {

        /**

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

+1 −7
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ 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.rules.WMFlickerServiceRuleForTestSpec

import org.junit.Assume.assumeFalse

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test
@@ -101,11 +99,7 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() {

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

        assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerRotatesScales()

    }

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    companion object {

        /**