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

Commit a12b40b1 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Ensure all flicker tests have an @Test annotation" into main

parents 0f3a6b35 71ab4010
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ open class EnterPipToOtherOrientation(flicker: LegacyFlickerTest) : PipTransitio
     * transition
     */
    @Ignore("TODO(b/356277166): enable the tablet test")
    @Postsubmit
    @Test
    open fun pipAppLayerPlusLetterboxCoversFullScreenOnStartTablet() {
        assumeTrue(tapl.isTablet)
+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ class BottomHalfEnterPipToOtherOrientation(flicker: LegacyFlickerTest) :
    }

    @Ignore("TODO(b/356277166): enable the tablet test")
    @Presubmit
    @Test
    override fun pipAppLayerPlusLetterboxCoversFullScreenOnStartTablet() {
        // Test app and pip app should covers the entire screen on start.
+12 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.server.wm.flicker.activityembedding.open

import android.graphics.Rect
import android.platform.test.annotations.Presubmit
import android.tools.flicker.junit.FlickerParametersRunnerFactory
import android.tools.flicker.legacy.FlickerBuilder
import android.tools.flicker.legacy.LegacyFlickerTest
@@ -68,13 +67,21 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest
        }
    }

    @Ignore("Not applicable to this CUJ.") override fun navBarWindowIsVisibleAtStartAndEnd() {}
    @Ignore("Not applicable to this CUJ.")
    @Test
    override fun navBarWindowIsVisibleAtStartAndEnd() {}

    @FlakyTest(bugId = 291575593) override fun entireScreenCovered() {}
    @FlakyTest(bugId = 291575593)
    @Test
    override fun entireScreenCovered() {}

    @Ignore("Not applicable to this CUJ.") override fun statusBarWindowIsAlwaysVisible() {}
    @Ignore("Not applicable to this CUJ.")
    @Test
    override fun statusBarWindowIsAlwaysVisible() {}

    @Ignore("Not applicable to this CUJ.") override fun statusBarLayerPositionAtStartAndEnd() {}
    @Ignore("Not applicable to this CUJ.")
    @Test
    override fun statusBarLayerPositionAtStartAndEnd() {}

    /** Transition begins with a split. */
    @FlakyTest(bugId = 286952194)
@@ -122,7 +129,6 @@ class MainActivityStartsSecondaryWithAlwaysExpandTest(flicker: LegacyFlickerTest

    /** Always expand activity is on top of the split. */
    @FlakyTest(bugId = 286952194)
    @Presubmit
    @Test
    fun endsWithAlwaysExpandActivityOnTop() {
        flicker.assertWmEnd {
+3 −0
Original line number Diff line number Diff line
@@ -176,12 +176,15 @@ class EnterSystemSplitTest(flicker: LegacyFlickerTest) : ActivityEmbeddingTestBa
    }

    @Ignore("Not applicable to this CUJ.")
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {}

    @FlakyTest(bugId = 342596801)
    @Test
    override fun entireScreenCovered() = super.entireScreenCovered()

    @FlakyTest(bugId = 342596801)
    @Test
    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

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

package com.android.server.wm.flicker.ime

import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.tools.Rotation
import android.tools.flicker.junit.FlickerParametersRunnerFactory
@@ -81,7 +80,6 @@ class ShowImeOnAppStartWhenLaunchingAppFromFixedOrientationTest(flicker: LegacyF
    }

    @FlakyTest(bugId = 290767483)
    @Postsubmit
    @Test
    fun imeLayerAlphaOneAfterSnapshotStartingWindowRemoval() {
        val layerTrace = flicker.reader.readLayersTrace() ?: error("Unable to read layers trace")