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

Commit c8232af3 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Promote passing app launch tests

Bug: 206753786
Bug: 229738092
Bug: 229735718
Fixes: 229738092
Test: atest FlickerTests
Change-Id: I02a7c83cd39b2ee463ec9910191691437ced0779
parent cf9ca7d7
Loading
Loading
Loading
Loading
+11 −11
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package com.android.server.wm.flicker.launch

import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Presubmit
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.BaseTest
@@ -82,55 +82,55 @@ class ActivitiesTransitionTest(testSpec: FlickerTestParameter) : BaseTest(testSp
    }

    /** {@inheritDoc} */
    @Postsubmit
    @FlakyTest(bugId = 206753786)
    @Test
    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun statusBarLayerIsVisibleAtStartAndEnd() =
        super.statusBarLayerIsVisibleAtStartAndEnd()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun statusBarLayerPositionAtStartAndEnd() =
        super.statusBarLayerPositionAtStartAndEnd()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    /** {@inheritDoc} */
    @Postsubmit
    @Presubmit
    @Test
    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
        super.visibleWindowsShownMoreThanOneConsecutiveEntry()
+1 −8
Original line number Diff line number Diff line
@@ -80,15 +80,8 @@ open class OpenAppColdTest(
    /** {@inheritDoc} */
    @FlakyTest(bugId = 206753786)
    @Test
    override fun statusBarLayerPositionAtStartAndEnd() =
        super.statusBarLayerPositionAtStartAndEnd()

    /** {@inheritDoc} */
    @FlakyTest(bugId = 206753786)
    @Test
    override fun navBarLayerPositionAtStartAndEnd() {
    override fun navBarLayerPositionAtStartAndEnd() =
        super.navBarLayerPositionAtStartAndEnd()
    }

    /** {@inheritDoc} */
    @Presubmit
+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch

import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.platform.test.annotations.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
@@ -189,6 +190,12 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :
    override fun appWindowIsTopWindowAtEnd() =
        super.appWindowIsTopWindowAtEnd()

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun appWindowBecomesTopWindow_ShellTransit() =
        super.appWindowBecomesTopWindow_ShellTransit()

    companion object {
        /**
         * Creates the test configurations.
+2 −33
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.annotation.Group1
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
import com.android.server.wm.flicker.helpers.setRotation
import org.junit.Assume
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
@@ -99,11 +97,6 @@ open class OpenAppFromOverviewTest(
            }
        }

    /** {@inheritDoc} */
    @FlakyTest(bugId = 206753786)
    @Test
    override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd()

    /** {@inheritDoc} */
    @Presubmit
    @Test
@@ -134,40 +127,16 @@ open class OpenAppFromOverviewTest(
    @Test
    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart()

    /** {@inheritDoc} */
    @FlakyTest(bugId = 229735718)
    @Test
    override fun entireScreenCovered() = super.entireScreenCovered()

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun appWindowReplacesLauncherAsTopWindow() {
        Assume.assumeFalse(isShellTransitionsEnabled)
    override fun appWindowReplacesLauncherAsTopWindow() =
        super.appWindowReplacesLauncherAsTopWindow()
    }

    @FlakyTest(bugId = 229738092)
    @Test
    fun appWindowReplacesLauncherAsTopWindow_ShellTransit() {
        Assume.assumeTrue(isShellTransitionsEnabled)
        super.appWindowReplacesLauncherAsTopWindow()
    }

    /** {@inheritDoc} */
    @Presubmit
    @Test
    override fun appWindowBecomesTopWindow() {
        Assume.assumeFalse(isShellTransitionsEnabled)
        super.appWindowBecomesTopWindow()
    }

    @FlakyTest(bugId = 229738092)
    @Test
    fun appWindowBecomesTopWindow_ShellTransit() {
        Assume.assumeTrue(isShellTransitionsEnabled)
        super.appWindowBecomesTopWindow()
    }
    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()

    companion object {
        /**
+1 −8
Original line number Diff line number Diff line
@@ -131,13 +131,6 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
        }
    }

    /**
     * Checks the position of the [ComponentMatcher.NAV_BAR] at the end of the transition
     */
    @Postsubmit
    @Test
    override fun navBarLayerPositionAtEnd() = super.navBarLayerPositionAtEnd()

    /** {@inheritDoc} */
    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
    override fun taskBarLayerIsVisibleAtStartAndEnd() { }
@@ -162,7 +155,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
     * Checks the position of the [ComponentMatcher.STATUS_BAR] at the end of the
     * transition
     */
    @Postsubmit
    @Presubmit
    @Test
    fun statusBarLayerPositionEnd() = testSpec.statusBarLayerPositionAtEnd()

Loading