Merge changes Ie6282dd8,Ibe625965 into main

* changes:
  Remove RequireDevice annotation from benchmark tests
  Add removed setup action
This commit is contained in:
Pablo Gamito
2023-07-18 08:24:51 +00:00
committed by Android (Google) Code Review
31 changed files with 1 additions and 60 deletions

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit
import org.junit.Test
@RequiresDevice
class CopyContentInSplitGesturalNavLandscapeBenchmark : CopyContentInSplit(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")
@Presubmit

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.CopyContentInSplit
import org.junit.Test
@RequiresDevice
class CopyContentInSplitGesturalNavPortraitBenchmark : CopyContentInSplit(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")
@Presubmit

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider
import org.junit.Test
@RequiresDevice
class DismissSplitScreenByDividerGesturalNavLandscapeBenchmark :
DismissSplitScreenByDivider(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByDivider
import org.junit.Test
@RequiresDevice
class DismissSplitScreenByDividerGesturalNavPortraitBenchmark :
DismissSplitScreenByDivider(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome
import org.junit.Test
@RequiresDevice
class DismissSplitScreenByGoHomeGesturalNavLandscapeBenchmark :
DismissSplitScreenByGoHome(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DismissSplitScreenByGoHome
import org.junit.Test
@RequiresDevice
class DismissSplitScreenByGoHomeGesturalNavPortraitBenchmark :
DismissSplitScreenByGoHome(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DragDividerToResize
import org.junit.Test
@RequiresDevice
class DragDividerToResizeGesturalNavLandscapeBenchmark : DragDividerToResize(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")
@Presubmit

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.DragDividerToResize
import org.junit.Test
@RequiresDevice
class DragDividerToResizeGesturalNavPortraitBenchmark : DragDividerToResize(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")
@Presubmit

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromAllApps
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromAllAppsGesturalNavLandscapeBenchmark :
EnterSplitScreenByDragFromAllApps(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromAllApps
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromAllAppsGesturalNavPortraitBenchmark :
EnterSplitScreenByDragFromAllApps(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromNotification
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromNotificationGesturalNavLandscapeBenchmark :
EnterSplitScreenByDragFromNotification(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromNotification
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromNotificationGesturalNavPortraitBenchmark :
EnterSplitScreenByDragFromNotification(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromShortcut
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromShortcutGesturalNavLandscapeBenchmark :
EnterSplitScreenByDragFromShortcut(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromShortcut
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromShortcutGesturalNavPortraitBenchmark :
EnterSplitScreenByDragFromShortcut(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromTaskbar
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromTaskbarGesturalNavLandscapeBenchmark :
EnterSplitScreenByDragFromTaskbar(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenByDragFromTaskbar
import org.junit.Test
@RequiresDevice
class EnterSplitScreenByDragFromTaskbarGesturalNavPortraitBenchmark :
EnterSplitScreenByDragFromTaskbar(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenFromOverview
import org.junit.Test
@RequiresDevice
class EnterSplitScreenFromOverviewGesturalNavLandscapeBenchmark :
EnterSplitScreenFromOverview(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.EnterSplitScreenFromOverview
import org.junit.Test
@RequiresDevice
class EnterSplitScreenFromOverviewGesturalNavPortraitBenchmark :
EnterSplitScreenFromOverview(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchAppByDoubleTapDivider
import org.junit.Test
@RequiresDevice
class SwitchAppByDoubleTapDividerGesturalNavLandscapeBenchmark :
SwitchAppByDoubleTapDivider(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchAppByDoubleTapDivider
import org.junit.Test
@RequiresDevice
class SwitchAppByDoubleTapDividerGesturalNavPortraitBenchmark :
SwitchAppByDoubleTapDivider(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromAnotherApp
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromAnotherAppGesturalNavLandscapeBenchmark :
SwitchBackToSplitFromAnotherApp(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromAnotherApp
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromAnotherAppGesturalNavPortraitBenchmark :
SwitchBackToSplitFromAnotherApp(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromHome
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromHomeGesturalNavLandscapeBenchmark :
SwitchBackToSplitFromHome(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromHome
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromHomeGesturalNavPortraitBenchmark :
SwitchBackToSplitFromHome(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromRecent
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromRecentGesturalNavLandscapeBenchmark :
SwitchBackToSplitFromRecent(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBackToSplitFromRecent
import org.junit.Test
@RequiresDevice
class SwitchBackToSplitFromRecentGesturalNavPortraitBenchmark :
SwitchBackToSplitFromRecent(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBetweenSplitPairs
import org.junit.Test
@RequiresDevice
class SwitchBetweenSplitPairsGesturalNavLandscapeBenchmark :
SwitchBetweenSplitPairs(Rotation.ROTATION_90) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -19,11 +19,9 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.SwitchBetweenSplitPairs
import org.junit.Test
@RequiresDevice
class SwitchBetweenSplitPairsGesturalNavPortraitBenchmark :
SwitchBetweenSplitPairs(Rotation.ROTATION_0) {
@PlatinumTest(focusArea = "sysui")

View File

@@ -18,13 +18,11 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.UnlockKeyguardToSplitScreen
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.BlockJUnit4ClassRunner
@RequiresDevice
@RunWith(BlockJUnit4ClassRunner::class)
class UnlockKeyguardToSplitScreenGesturalNavLandscapeBenchmark : UnlockKeyguardToSplitScreen() {
@PlatinumTest(focusArea = "sysui")

View File

@@ -18,13 +18,11 @@ package com.android.wm.shell.flicker.service.splitscreen.benchmark
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import androidx.test.filters.RequiresDevice
import com.android.wm.shell.flicker.service.splitscreen.scenarios.UnlockKeyguardToSplitScreen
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.BlockJUnit4ClassRunner
@RequiresDevice
@RunWith(BlockJUnit4ClassRunner::class)
class UnlockKeyguardToSplitScreenGesturalNavPortraitBenchmark : UnlockKeyguardToSplitScreen() {
@PlatinumTest(focusArea = "sysui")

View File

@@ -47,6 +47,7 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {
fun setup() {
tapl.setEnableRotation(true)
tapl.setExpectedRotation(rotation.value)
tapl.workspace.switchToOverview().dismissAllTasks()
SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp)