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

Commit f8e898e2 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Demote PipRotationTest when shell transitions are enabled 

Test: atest WMShellFlickerTests:PipRotationTest_ShellTransit

Bug: 239575053
Change-Id: I4321673c7eaa22f7282fa42d23d6fdac8d9e1b8c
parent 6f8434a0

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

+8 −0
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ import com.android.server.wm.flicker.annotation.Group4 
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.helpers.setRotation

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

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -64,6 +67,11 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    private val screenBoundsStart = WindowUtils.getDisplayBounds(testSpec.startRotation)

    private val screenBoundsEnd = WindowUtils.getDisplayBounds(testSpec.endRotation)



    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = false) {

            setup {

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

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



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



import android.platform.test.annotations.FlakyTest

import androidx.test.filters.RequiresDevice

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

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

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

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

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test Pip Stack in bounds after rotations.

 *

 * To run this test: `atest WMShellFlickerTests:PipRotationTest_ShellTransit`

 *

 * Actions:

 *     Launch a [pipApp] in pip mode

 *     Launch another app [fixedApp] (appears below pip)

 *     Rotate the screen from [testSpec.startRotation] to [testSpec.endRotation]

 *     (usually, 0->90 and 90->0)

 *

 * Notes:

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)

 *        are inherited from [PipTransition]

 *     2. Part of the test setup occurs automatically via

 *        [com.android.server.wm.flicker.TransitionRunnerWithRules],

 *        including configuring navigation mode, initial orientation and ensuring no

 *        apps are running before setup

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group4

@FlakyTest(bugId = 239575053)

class PipRotationTest_ShellTransit(testSpec: FlickerTestParameter) : PipRotationTest(testSpec) {

    @Before

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

    }

}