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

Commit 3d4661b3 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Add stable tests back to presubmit 

Bug: 219749605

Bug: 219757170

Test: n/a
Change-Id: Ie326da68469fb0b8d7dc84efd66e50a819e26933
parent 4769e90c

tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 219749605)

class LaunchAppShowImeAndDialogThemeAppTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt

+7 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.server.wm.traces.common.FlickerComponentName 
import com.android.server.wm.traces.common.WindowManagerConditionsFactory

import org.junit.Assume.assumeFalse

import org.junit.Assume.assumeTrue

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -61,8 +62,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

@FlakyTest(bugId = 219757170)

class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {

open class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)
@@ -72,6 +72,11 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
        WindowManagerConditionsFactory.isHomeActivityVisible()

    ))



    @Before

    open fun before() {

        assumeFalse(isShellTransitionsEnabled)

    }



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest_ShellTransit.kt

0 → 100644
+49 −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.server.wm.flicker.ime



import android.platform.test.annotations.Postsubmit

import androidx.test.filters.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.Group2

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 IME window opening transitions.

 * To run this test: `atest FlickerTests:ReOpenImeWindowTest`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

@FlakyTest(bugId = 221854428)

class ReOpenImeWindowTest_ShellTransit(private val testSpec: FlickerTestParameter)

    : ReOpenImeWindowTest(testSpec) {

    @Before

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

    }

}