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

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

Merge "Remove @FlakyTest"

parents 6383eee9 a24403cb

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt

+3 −17
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.appWindowBecomesInvisible

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
@@ -35,7 +34,6 @@ import com.android.wm.shell.flicker.layerIsVisibleAtEnd 
import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesInvisible

import com.android.wm.shell.flicker.splitScreenDismissed

import com.android.wm.shell.flicker.splitScreenDividerBecomesInvisible

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -95,7 +93,9 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen 
    fun primaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(

        primaryApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)



    private fun secondaryAppBoundsIsFullscreenAtEnd_internal() {

    @Presubmit

    @Test

    fun secondaryAppBoundsIsFullscreenAtEnd() {

        testSpec.assertLayers {

            this.isVisible(secondaryApp)

                .isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
@@ -115,20 +115,6 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen 
        }

    }



    @Presubmit

    @Test

    fun secondaryAppBoundsIsFullscreenAtEnd() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        secondaryAppBoundsIsFullscreenAtEnd_internal()

    }



    @FlakyTest(bugId = 250528485)

    @Test

    fun secondaryAppBoundsIsFullscreenAtEnd_shellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        secondaryAppBoundsIsFullscreenAtEnd_internal()

    }



    @Presubmit

    @Test

    fun primaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(primaryApp)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt

+0 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit
@@ -146,19 +145,15 @@ class SwitchAppByDoubleTapDivider(testSpec: FlickerTestParameter) : SplitScreenB 
        // robust enough to get the correct end state.

    }



    @FlakyTest(bugId = 241524174)

    @Test

    fun splitScreenDividerKeepVisible() = testSpec.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)



    @FlakyTest(bugId = 241524174)

    @Test

    fun primaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(primaryApp)



    @FlakyTest(bugId = 241524174)

    @Test

    fun secondaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(secondaryApp)



    @FlakyTest(bugId = 241524174)

    @Test

    fun primaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(

        primaryApp,
@@ -166,9 +161,6 @@ class SwitchAppByDoubleTapDivider(testSpec: FlickerTestParameter) : SplitScreenB 
        portraitPosTop = true

    )



    // TODO(b/246490534): Move back to presubmit after withAppTransitionIdle is robust enough to

    // get the correct end state.

    @FlakyTest(bugId = 246490534)

    @Test

    fun secondaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(

        secondaryApp,
@@ -176,11 +168,9 @@ class SwitchAppByDoubleTapDivider(testSpec: FlickerTestParameter) : SplitScreenB 
        portraitPosTop = false

    )



    @FlakyTest(bugId = 241524174)

    @Test

    fun primaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(primaryApp)



    @FlakyTest(bugId = 241524174)

    @Test

    fun secondaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(secondaryApp)