From 7c270b3a8d4200b684c8d86f377bab03c23d2197 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Wed, 11 Jan 2023 16:51:15 +0000 Subject: [PATCH] Promote passing app launch tests Bug: 206753786 Bug: 240916028 Test: atest FlickerTest Change-Id: I60ad08507104724a982cdb7c059d9879795fc1ee --- .../launch/ActivitiesTransitionTest.kt | 6 - .../flicker/launch/OpenAppAfterCameraTest.kt | 8 - .../OpenAppAfterCameraTest_ShellTransit.kt | 162 ------------------ .../wm/flicker/launch/OpenAppColdFromIcon.kt | 99 ----------- .../wm/flicker/launch/OpenAppColdTest.kt | 6 - .../launch/OpenAppFromLockNotificationCold.kt | 3 - .../launch/OpenAppFromNotificationCold.kt | 4 +- .../launch/OpenAppFromNotificationWarm.kt | 5 +- .../flicker/launch/OpenAppFromOverviewTest.kt | 3 - .../wm/flicker/launch/OpenAppWarmTest.kt | 3 - .../wm/flicker/launch/TaskTransitionTest.kt | 10 +- 11 files changed, 6 insertions(+), 303 deletions(-) delete mode 100644 tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest_ShellTransit.kt diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt index 3d1342c0f41d5..1baff37220c3f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.BaseTest @@ -74,11 +73,6 @@ open class ActivitiesTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { } } - /** {@inheritDoc} */ - @FlakyTest(bugId = 206753786) - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - /** * Checks that the [ActivityOptions.LaunchNewActivity] activity is visible at the start of the * transition, that [ActivityOptions.SimpleActivity] becomes visible during the transition, and diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt index 4ca9d5fa90e3d..baa2750aa0c62 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt @@ -21,10 +21,7 @@ import com.android.server.wm.flicker.FlickerBuilder import com.android.server.wm.flicker.FlickerTest import com.android.server.wm.flicker.FlickerTestFactory import com.android.server.wm.flicker.helpers.CameraAppHelper -import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import org.junit.Assume -import org.junit.Before import org.junit.FixMethodOrder import org.junit.runner.RunWith import org.junit.runners.MethodSorters @@ -42,11 +39,6 @@ import org.junit.runners.Parameterized @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) open class OpenAppAfterCameraTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) { - @Before - open fun before() { - Assume.assumeFalse(isShellTransitionsEnabled) - } - private val cameraApp = CameraAppHelper(instrumentation) /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest_ShellTransit.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest_ShellTransit.kt deleted file mode 100644 index a9f9204ded343..0000000000000 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest_ShellTransit.kt +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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.server.wm.flicker.launch - -import android.platform.test.annotations.FlakyTest -import androidx.test.filters.RequiresDevice -import com.android.server.wm.flicker.FlickerTest -import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled -import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import org.junit.Assume -import org.junit.Before -import org.junit.FixMethodOrder -import org.junit.Test -import org.junit.runner.RunWith -import org.junit.runners.MethodSorters -import org.junit.runners.Parameterized - -/** - * Test launching an app after cold opening camera (with shell transitions) - * - * To run this test: `atest FlickerTests:OpenAppAfterCameraTest_ShellTransit` - * - * Notes: Some default assertions are inherited [OpenAppTransition] - */ -@RequiresDevice -@RunWith(Parameterized::class) -@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -class OpenAppAfterCameraTest_ShellTransit(flicker: FlickerTest) : OpenAppAfterCameraTest(flicker) { - @Before - override fun before() { - Assume.assumeTrue(isShellTransitionsEnabled) - } - - @FlakyTest - @Test - override fun appLayerReplacesLauncher() { - super.appLayerReplacesLauncher() - } - - @FlakyTest - @Test - override fun appLayerBecomesVisible() { - super.appLayerBecomesVisible() - } - - @FlakyTest - @Test - override fun appWindowBecomesTopWindow() { - super.appWindowBecomesTopWindow() - } - - @FlakyTest - @Test - override fun appWindowBecomesVisible() { - super.appWindowBecomesVisible() - } - - @FlakyTest - @Test - override fun appWindowIsTopWindowAtEnd() { - super.appWindowIsTopWindowAtEnd() - } - - @FlakyTest - @Test - override fun appWindowReplacesLauncherAsTopWindow() { - super.appWindowReplacesLauncherAsTopWindow() - } - - @FlakyTest - @Test - override fun entireScreenCovered() { - super.entireScreenCovered() - } - - @FlakyTest - @Test - override fun navBarLayerIsVisibleAtStartAndEnd() { - super.navBarLayerIsVisibleAtStartAndEnd() - } - - @FlakyTest - @Test - override fun navBarLayerPositionAtStartAndEnd() { - super.navBarLayerPositionAtStartAndEnd() - } - - @FlakyTest - @Test - override fun navBarWindowIsAlwaysVisible() { - super.navBarWindowIsAlwaysVisible() - } - - @FlakyTest - @Test - override fun statusBarLayerIsVisibleAtStartAndEnd() { - super.statusBarLayerIsVisibleAtStartAndEnd() - } - - @FlakyTest - @Test - override fun statusBarLayerPositionAtStartAndEnd() { - super.statusBarLayerPositionAtStartAndEnd() - } - - @FlakyTest - @Test - override fun statusBarWindowIsAlwaysVisible() { - super.statusBarWindowIsAlwaysVisible() - } - - @FlakyTest - @Test - override fun taskBarLayerIsVisibleAtStartAndEnd() { - super.taskBarLayerIsVisibleAtStartAndEnd() - } - - @FlakyTest - @Test - override fun taskBarWindowIsAlwaysVisible() { - super.taskBarWindowIsAlwaysVisible() - } - - @FlakyTest - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() { - super.visibleLayersShownMoreThanOneConsecutiveEntry() - } - - @FlakyTest - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() { - super.visibleWindowsShownMoreThanOneConsecutiveEntry() - } - - @FlakyTest - @Test - override fun focusChanges() { - super.focusChanges() - } - - @FlakyTest - @Test - override fun appWindowAsTopWindowAtEnd() { - super.appWindowAsTopWindowAtEnd() - } -} diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt index 242f4576d8086..9d86f8c8dc81c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.platform.test.annotations.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerBuilder import com.android.server.wm.flicker.FlickerTest @@ -25,7 +24,6 @@ import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import com.android.server.wm.traces.common.service.PlatformConsts import org.junit.FixMethodOrder -import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -77,103 +75,6 @@ class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransition( teardown { testApp.exit(wmHelper) } } - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appWindowAsTopWindowAtEnd() = super.appWindowAsTopWindowAtEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appWindowReplacesLauncherAsTopWindow() = - super.appWindowReplacesLauncherAsTopWindow() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appLayerBecomesVisible() = super.appLayerBecomesVisible() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appWindowBecomesVisible() = super.appWindowBecomesVisible() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun entireScreenCovered() = super.entireScreenCovered() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) @Test override fun focusChanges() = super.focusChanges() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun statusBarLayerIsVisibleAtStartAndEnd() = - super.statusBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = - super.visibleWindowsShownMoreThanOneConsecutiveEntry() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 240916028) - @Test - override fun appWindowIsTopWindowAtEnd() = super.appWindowIsTopWindowAtEnd() - companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index a4f09c000963b..9fbec973e93f1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerBuilder @@ -70,11 +69,6 @@ open class OpenAppColdTest(flicker: FlickerTest) : OpenAppFromLauncherTransition transitions { testApp.launchViaIntent(wmHelper) } } - /** {@inheritDoc} */ - @FlakyTest(bugId = 206753786) - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - /** {@inheritDoc} */ @Presubmit @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt index 56d7d5e133de9..991cd1c0f0091 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt @@ -112,9 +112,6 @@ open class OpenAppFromLockNotificationCold(flicker: FlickerTest) : @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end") override fun navBarWindowIsAlwaysVisible() {} - /** {@inheritDoc} */ - @Postsubmit @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible() - /** {@inheritDoc} */ @Postsubmit @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt index 6c833c4a5b622..90c18c4f8558e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt @@ -61,9 +61,9 @@ open class OpenAppFromNotificationCold(flicker: FlickerTest) : } } - @Postsubmit @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_coldStart() + @Presubmit @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_coldStart() - @Postsubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_coldStart() + @Presubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_coldStart() /** {@inheritDoc} */ @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt index d582931d882b2..efca6abc36ef3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt @@ -16,7 +16,6 @@ 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.view.WindowInsets @@ -112,9 +111,9 @@ open class OpenAppFromNotificationWarm(flicker: FlickerTest) : OpenAppTransition teardown { testApp.exit(wmHelper) } } - @FlakyTest @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_warmStart() + @Presubmit @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_warmStart() - @Postsubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_warmStart() + @Presubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_warmStart() @Presubmit @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index db4baa0398568..2b16ef0de5a8e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -86,9 +86,6 @@ open class OpenAppFromOverviewTest(flicker: FlickerTest) : OpenAppFromLauncherTr } } - /** {@inheritDoc} */ - @Presubmit @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher() - /** {@inheritDoc} */ @FlakyTest @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 7a7990f4e36c0..93bf099959847 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -78,9 +78,6 @@ open class OpenAppWarmTest(flicker: FlickerTest) : OpenAppFromLauncherTransition @Test override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - /** {@inheritDoc} */ - @Presubmit @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher() - /** {@inheritDoc} */ @Presubmit @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt index 31babb8479b62..959ab3dd97cc0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt @@ -20,7 +20,6 @@ import android.app.Instrumentation import android.app.WallpaperManager import android.content.res.Resources import android.platform.test.annotations.FlakyTest -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.BaseTest @@ -92,7 +91,7 @@ class TaskTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { * Checks that the [wallpaper] layer is never visible when performing task transitions. A solid * color background should be shown instead. */ - @FlakyTest(bugId = 253617416) + @Presubmit @Test fun wallpaperLayerIsNeverVisible() { flicker.assertLayers { @@ -192,7 +191,7 @@ class TaskTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { * Checks that we start with the LaunchNewTask activity on top and then open up the * SimpleActivity and then go back to the LaunchNewTask activity. */ - @Postsubmit + @Presubmit @Test fun newTaskOpensOnTopAndThenCloses() { flicker.assertWm { @@ -208,11 +207,6 @@ class TaskTransitionTest(flicker: FlickerTest) : BaseTest(flicker) { } } - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - companion object { private fun getWallpaperPackage(instrumentation: Instrumentation): IComponentMatcher { val wallpaperManager = WallpaperManager.getInstance(instrumentation.targetContext)