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

Commit d25198a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable flaky tests"

parents e717ddd4 77dff60b

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

+10 −2
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 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.dsl.FlickerBuilder

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

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -44,11 +47,16 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {

open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    private val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager

    private val displaySize = DisplayMetrics()



    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            setup {
@@ -68,7 +76,7 @@ class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(tes 


    @Presubmit

    @Test

    fun testAppIsAlwaysVisible() {

    open fun testAppIsAlwaysVisible() {

        testSpec.assertLayers {

            this.isVisible(testApp.component)

        }

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

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

 * Copyright (C) 2022 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.bubble



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.Group4

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

import org.junit.Assume

import org.junit.Before



import org.junit.runner.RunWith

import org.junit.runners.Parameterized



@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

@FlakyTest(bugId = 217777115)

class DismissBubbleScreenShellTransit(

    testSpec: FlickerTestParameter

) : DismissBubbleScreen(testSpec) {

    @Before

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

    }

}

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

+10 −2
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 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.dsl.FlickerBuilder

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

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -42,7 +45,12 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {

open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {
@@ -61,7 +69,7 @@ class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test 


    @Presubmit

    @Test

    fun testAppIsAlwaysVisible() {

    open fun testAppIsAlwaysVisible() {

        testSpec.assertLayers {

            this.isVisible(testApp.component)

        }

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

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

 * Copyright (C) 2022 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.bubble



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.Group4

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

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.runners.Parameterized



@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

@FlakyTest(bugId = 217777115)

class ExpandBubbleScreenShellTransit(

    testSpec: FlickerTestParameter

) : ExpandBubbleScreen(testSpec) {

    @Before

    override fun before() {

        Assume.assumeTrue(isShellTransitionsEnabled)

    }

}
 
 No newline at end of file

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

+10 −2
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 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.dsl.FlickerBuilder

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

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -39,7 +42,12 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {

open class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {
@@ -51,7 +59,7 @@ class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test 


    @Presubmit

    @Test

    fun testAppIsAlwaysVisible() {

    open fun testAppIsAlwaysVisible() {

        testSpec.assertLayers {

            this.isVisible(testApp.component)

        }