Merge "Remove old benchmark tests" into udc-qpr-dev am: 2ffc95a27e am: 3127643183
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23829163 Change-Id: I1ee2bf1688c485fc3841d07f5a4073e6a8dc30dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -18,10 +18,10 @@ package com.android.wm.shell.flicker.appcompat
|
||||
|
||||
import android.platform.test.annotations.Postsubmit
|
||||
import android.platform.test.annotations.RequiresDevice
|
||||
import android.tools.common.flicker.assertions.FlickerTest
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.common.Rotation
|
||||
import android.tools.common.datatypes.Rect
|
||||
import android.tools.common.flicker.assertions.FlickerTest
|
||||
import android.tools.common.traces.component.ComponentNameMatcher
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
@@ -45,7 +45,6 @@ import org.junit.runners.Parameterized
|
||||
* Swipe right from the bottom of the screen to quick switch back to the app
|
||||
* ```
|
||||
*/
|
||||
|
||||
@RequiresDevice
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@@ -152,9 +151,8 @@ open class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) :
|
||||
@Test
|
||||
fun appWindowBecomesAndStaysVisible() {
|
||||
flicker.assertWm {
|
||||
this.isAppWindowInvisible(letterboxApp)
|
||||
.then()
|
||||
.isAppWindowVisible(letterboxApp) }
|
||||
this.isAppWindowInvisible(letterboxApp).then().isAppWindowVisible(letterboxApp)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -245,7 +243,8 @@ open class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) :
|
||||
.isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)
|
||||
.then()
|
||||
.isVisible(letterboxApp)
|
||||
.isVisible(ComponentNameMatcher.LETTERBOX) }
|
||||
.isVisible(ComponentNameMatcher.LETTERBOX)
|
||||
}
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
@@ -273,4 +272,4 @@ open class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) :
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,11 +66,12 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) :
|
||||
AutoEnterPipOnGoToHomeTest(flicker) {
|
||||
private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0)
|
||||
/** Second app used to enter split screen mode */
|
||||
private val secondAppForSplitScreen = SimpleAppHelper(
|
||||
instrumentation,
|
||||
ActivityOptions.SplitScreen.Primary.LABEL,
|
||||
ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent()
|
||||
)
|
||||
private val secondAppForSplitScreen =
|
||||
SimpleAppHelper(
|
||||
instrumentation,
|
||||
ActivityOptions.SplitScreen.Primary.LABEL,
|
||||
ActivityOptions.SplitScreen.Primary.COMPONENT.toFlickerComponent()
|
||||
)
|
||||
|
||||
/** Defines the transition used to run the test */
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
|
||||
@@ -29,9 +29,7 @@ import org.junit.runner.RunWith
|
||||
|
||||
@RunWith(FlickerServiceJUnit4ClassRunner::class)
|
||||
class CopyContentInSplitGesturalNavLandscape : CopyContentInSplit(Rotation.ROTATION_90) {
|
||||
@ExpectedScenarios([])
|
||||
@Test
|
||||
override fun copyContentInSplit() = super.copyContentInSplit()
|
||||
@ExpectedScenarios([]) @Test override fun copyContentInSplit() = super.copyContentInSplit()
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
|
||||
@@ -29,9 +29,7 @@ import org.junit.runner.RunWith
|
||||
|
||||
@RunWith(FlickerServiceJUnit4ClassRunner::class)
|
||||
class CopyContentInSplitGesturalNavPortrait : CopyContentInSplit(Rotation.ROTATION_0) {
|
||||
@ExpectedScenarios([])
|
||||
@Test
|
||||
override fun copyContentInSplit() = super.copyContentInSplit()
|
||||
@ExpectedScenarios([]) @Test override fun copyContentInSplit() = super.copyContentInSplit()
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.wm.shell.flicker.splitscreen
|
||||
|
||||
import android.platform.test.annotations.FlakyTest
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.traces.component.ComponentNameMatcher
|
||||
import android.tools.common.traces.component.EdgeExtensionComponentMatcher
|
||||
@@ -28,13 +27,9 @@ import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.ICommonAssertions
|
||||
import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.appWindowKeepVisible
|
||||
import com.android.wm.shell.flicker.layerKeepVisible
|
||||
import com.android.wm.shell.flicker.splitAppLayerBoundsKeepVisible
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.splitscreen.benchmark.CopyContentInSplitBenchmark
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
@@ -60,21 +55,6 @@ class CopyContentInSplit(override val flicker: LegacyFlickerTest) :
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
override fun cujCompleted() {
|
||||
flicker.appWindowIsVisibleAtStart(primaryApp)
|
||||
flicker.appWindowIsVisibleAtStart(textEditApp)
|
||||
flicker.splitScreenDividerIsVisibleAtStart()
|
||||
|
||||
flicker.appWindowIsVisibleAtEnd(primaryApp)
|
||||
flicker.appWindowIsVisibleAtEnd(textEditApp)
|
||||
flicker.splitScreenDividerIsVisibleAtEnd()
|
||||
|
||||
// The validation of copied text is already done in SplitScreenUtils.copyContentInSplit()
|
||||
}
|
||||
|
||||
@Presubmit
|
||||
@Test
|
||||
fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.wm.shell.flicker.splitscreen
|
||||
|
||||
import android.platform.test.annotations.FlakyTest
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
@@ -26,13 +25,9 @@ import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.ICommonAssertions
|
||||
import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.appWindowKeepVisible
|
||||
import com.android.wm.shell.flicker.layerKeepVisible
|
||||
import com.android.wm.shell.flicker.splitAppLayerBoundsChanges
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.splitscreen.benchmark.DragDividerToResizeBenchmark
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
@@ -58,19 +53,6 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
override fun cujCompleted() {
|
||||
flicker.appWindowIsVisibleAtStart(primaryApp)
|
||||
flicker.appWindowIsVisibleAtStart(secondaryApp)
|
||||
flicker.splitScreenDividerIsVisibleAtStart()
|
||||
|
||||
flicker.appWindowIsVisibleAtEnd(primaryApp)
|
||||
flicker.appWindowIsVisibleAtEnd(secondaryApp)
|
||||
flicker.splitScreenDividerIsVisibleAtEnd()
|
||||
}
|
||||
|
||||
@Presubmit
|
||||
@Test
|
||||
fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Postsubmit
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
@@ -28,12 +27,9 @@ import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.ICommonAssertions
|
||||
import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.layerIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.layerKeepVisible
|
||||
import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.splitscreen.benchmark.SwitchAppByDoubleTapDividerBenchmark
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
@@ -59,19 +55,6 @@ class SwitchAppByDoubleTapDivider(override val flicker: LegacyFlickerTest) :
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
override fun cujCompleted() {
|
||||
flicker.appWindowIsVisibleAtStart(primaryApp)
|
||||
flicker.appWindowIsVisibleAtStart(secondaryApp)
|
||||
flicker.splitScreenDividerIsVisibleAtStart()
|
||||
|
||||
flicker.appWindowIsVisibleAtEnd(primaryApp)
|
||||
flicker.appWindowIsVisibleAtEnd(secondaryApp)
|
||||
flicker.splitScreenDividerIsVisibleAtEnd()
|
||||
}
|
||||
|
||||
@Presubmit
|
||||
@Test
|
||||
fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
package com.android.wm.shell.flicker.splitscreen
|
||||
|
||||
import android.platform.test.annotations.FlakyTest
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
@@ -28,15 +27,10 @@ import com.android.wm.shell.flicker.ICommonAssertions
|
||||
import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
|
||||
import com.android.wm.shell.flicker.appWindowBecomesInvisible
|
||||
import com.android.wm.shell.flicker.appWindowBecomesVisible
|
||||
import com.android.wm.shell.flicker.appWindowIsInvisibleAtEnd
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.layerBecomesInvisible
|
||||
import com.android.wm.shell.flicker.layerBecomesVisible
|
||||
import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitAppLayerBoundsSnapToDivider
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd
|
||||
import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart
|
||||
import com.android.wm.shell.flicker.splitscreen.benchmark.SwitchBetweenSplitPairsBenchmark
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
@@ -62,21 +56,6 @@ class SwitchBetweenSplitPairs(override val flicker: LegacyFlickerTest) :
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
override fun cujCompleted() {
|
||||
flicker.appWindowIsVisibleAtStart(thirdApp)
|
||||
flicker.appWindowIsVisibleAtStart(fourthApp)
|
||||
flicker.splitScreenDividerIsVisibleAtStart()
|
||||
|
||||
flicker.appWindowIsVisibleAtEnd(primaryApp)
|
||||
flicker.appWindowIsVisibleAtEnd(secondaryApp)
|
||||
flicker.appWindowIsInvisibleAtEnd(thirdApp)
|
||||
flicker.appWindowIsInvisibleAtEnd(fourthApp)
|
||||
flicker.splitScreenDividerIsVisibleAtEnd()
|
||||
}
|
||||
|
||||
@Presubmit
|
||||
@Test
|
||||
fun splitScreenDividerInvisibleAtMiddle() =
|
||||
|
||||
@@ -16,18 +16,15 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.traces.component.ComponentNameMatcher
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -36,7 +33,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class CopyContentInSplitBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class CopyContentInSplitBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val textEditApp = SplitScreenUtils.getIme(instrumentation)
|
||||
protected val magnifierLayer = ComponentNameMatcher("", "magnifier surface bbq wrapper#")
|
||||
@@ -54,21 +51,6 @@ open class CopyContentInSplitBenchmark(override val flicker: LegacyFlickerTest)
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
open fun cujCompleted() {
|
||||
// The validation of copied text is already done in SplitScreenUtils.copyContentInSplit()
|
||||
}
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,18 +16,14 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenDismissed
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -36,7 +32,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class DismissSplitScreenByDividerBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class DismissSplitScreenByDividerBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -61,19 +57,6 @@ open class DismissSplitScreenByDividerBenchmark(override val flicker: LegacyFlic
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenDismissed(primaryApp, secondaryApp, toHome = false)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,18 +16,14 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenDismissed
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -36,7 +32,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class DismissSplitScreenByGoHomeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class DismissSplitScreenByGoHomeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -47,19 +43,6 @@ open class DismissSplitScreenByGoHomeBenchmark(override val flicker: LegacyFlick
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenDismissed(primaryApp, secondaryApp, toHome = true)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,19 +16,16 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
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
|
||||
@@ -37,7 +34,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class DragDividerToResizeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class DragDividerToResizeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -45,27 +42,11 @@ open class DragDividerToResizeBenchmark(override val flicker: LegacyFlickerTest)
|
||||
transitions { SplitScreenUtils.dragDividerToResizeAndWait(device, wmHelper) }
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@Before
|
||||
fun before() {
|
||||
Assume.assumeTrue(tapl.isTablet || !flicker.scenario.isLandscapeOrSeascapeAtStart)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
open fun cujCompleted() {
|
||||
// TODO(b/246490534): Add validation for resized app after withAppTransitionIdle is
|
||||
// robust enough to get the correct end state.
|
||||
}
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,21 +16,17 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
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
|
||||
@@ -39,7 +35,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class EnterSplitScreenByDragFromAllAppsBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class EnterSplitScreenByDragFromAllAppsBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
@@ -57,30 +53,11 @@ open class EnterSplitScreenByDragFromAllAppsBenchmark(override val flicker: Lega
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@Before
|
||||
fun before() {
|
||||
Assume.assumeTrue(tapl.isTablet)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() =
|
||||
flicker.splitScreenEntered(
|
||||
primaryApp,
|
||||
secondaryApp,
|
||||
fromOtherApp = false,
|
||||
appExistAtStart = false
|
||||
)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,21 +16,17 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
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
|
||||
@@ -39,7 +35,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class EnterSplitScreenByDragFromNotificationBenchmark(
|
||||
abstract class EnterSplitScreenByDragFromNotificationBenchmark(
|
||||
override val flicker: LegacyFlickerTest
|
||||
) : SplitScreenBase(flicker) {
|
||||
protected val sendNotificationApp = SplitScreenUtils.getSendNotification(instrumentation)
|
||||
@@ -59,21 +55,6 @@ open class EnterSplitScreenByDragFromNotificationBenchmark(
|
||||
teardown { sendNotificationApp.exit(wmHelper) }
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() =
|
||||
flicker.splitScreenEntered(primaryApp, sendNotificationApp, fromOtherApp = false)
|
||||
|
||||
@Before
|
||||
fun before() {
|
||||
Assume.assumeTrue(tapl.isTablet)
|
||||
|
||||
@@ -16,21 +16,17 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
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
|
||||
@@ -39,8 +35,9 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class EnterSplitScreenByDragFromShortcutBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
abstract class EnterSplitScreenByDragFromShortcutBenchmark(
|
||||
override val flicker: LegacyFlickerTest
|
||||
) : SplitScreenBase(flicker) {
|
||||
@Before
|
||||
fun before() {
|
||||
Assume.assumeTrue(tapl.isTablet)
|
||||
@@ -62,25 +59,6 @@ open class EnterSplitScreenByDragFromShortcutBenchmark(override val flicker: Leg
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() =
|
||||
flicker.splitScreenEntered(
|
||||
primaryApp,
|
||||
secondaryApp,
|
||||
fromOtherApp = false,
|
||||
appExistAtStart = false
|
||||
)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,21 +16,17 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
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
|
||||
@@ -39,7 +35,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class EnterSplitScreenByDragFromTaskbarBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class EnterSplitScreenByDragFromTaskbarBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -56,26 +52,6 @@ open class EnterSplitScreenByDragFromTaskbarBenchmark(override val flicker: Lega
|
||||
}
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() =
|
||||
flicker.splitScreenEntered(
|
||||
primaryApp,
|
||||
secondaryApp,
|
||||
fromOtherApp = false,
|
||||
appExistAtStart = false
|
||||
)
|
||||
|
||||
@Before
|
||||
fun before() {
|
||||
Assume.assumeTrue(tapl.isTablet)
|
||||
|
||||
@@ -16,18 +16,14 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -36,7 +32,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class EnterSplitScreenFromOverviewBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class EnterSplitScreenFromOverviewBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -56,19 +52,6 @@ open class EnterSplitScreenFromOverviewBenchmark(override val flicker: LegacyFli
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = true)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.common.Rotation
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
@@ -27,10 +25,9 @@ import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import android.tools.device.helpers.WindowUtils
|
||||
import android.tools.device.traces.parsers.WindowManagerStateHelper
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -39,7 +36,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class SwitchAppByDoubleTapDividerBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class SwitchAppByDoubleTapDividerBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -53,14 +50,6 @@ open class SwitchAppByDoubleTapDividerBenchmark(override val flicker: LegacyFlic
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
private fun waitForWindowsToSwitch(wmHelper: WindowManagerStateHelper) {
|
||||
wmHelper
|
||||
.StateSyncBuilder()
|
||||
@@ -134,14 +123,6 @@ open class SwitchAppByDoubleTapDividerBenchmark(override val flicker: LegacyFlic
|
||||
return displayBounds.width > displayBounds.height
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
open fun cujCompleted() {
|
||||
// TODO(b/246490534): Add validation for switched app after withAppTransitionIdle is
|
||||
// robust enough to get the correct end state.
|
||||
}
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,19 +16,15 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -37,7 +33,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class SwitchBackToSplitFromAnotherAppBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class SwitchBackToSplitFromAnotherAppBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
private val thirdApp = SplitScreenUtils.getNonResizeable(instrumentation)
|
||||
|
||||
@@ -55,19 +51,6 @@ open class SwitchBackToSplitFromAnotherAppBenchmark(override val flicker: Legacy
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = true)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,19 +16,15 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -37,7 +33,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class SwitchBackToSplitFromHomeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class SwitchBackToSplitFromHomeBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -53,19 +49,6 @@ open class SwitchBackToSplitFromHomeBenchmark(override val flicker: LegacyFlicke
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = true)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,19 +16,15 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.common.NavBar
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitScreenEntered
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -37,7 +33,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class SwitchBackToSplitFromRecentBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class SwitchBackToSplitFromRecentBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -53,19 +49,6 @@ open class SwitchBackToSplitFromRecentBenchmark(override val flicker: LegacyFlic
|
||||
}
|
||||
}
|
||||
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
withoutTracing(this)
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui")
|
||||
@Presubmit
|
||||
@Test
|
||||
fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = true)
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -16,17 +16,14 @@
|
||||
|
||||
package com.android.wm.shell.flicker.splitscreen.benchmark
|
||||
|
||||
import android.platform.test.annotations.PlatinumTest
|
||||
import android.platform.test.annotations.Presubmit
|
||||
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
|
||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
import org.junit.runners.Parameterized
|
||||
@@ -35,7 +32,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class SwitchBetweenSplitPairsBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class SwitchBetweenSplitPairsBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thirdApp = SplitScreenUtils.getIme(instrumentation)
|
||||
protected val fourthApp = SplitScreenUtils.getSendNotification(instrumentation)
|
||||
@@ -64,8 +61,6 @@ open class SwitchBetweenSplitPairsBenchmark(override val flicker: LegacyFlickerT
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
@PlatinumTest(focusArea = "sysui") @Presubmit @Test open fun cujCompleted() {}
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
@@ -22,8 +22,8 @@ import android.tools.device.flicker.legacy.FlickerBuilder
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTest
|
||||
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
|
||||
import androidx.test.filters.RequiresDevice
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import com.android.wm.shell.flicker.SplitScreenUtils
|
||||
import com.android.wm.shell.flicker.splitscreen.SplitScreenBase
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.MethodSorters
|
||||
@@ -33,7 +33,7 @@ import org.junit.runners.Parameterized
|
||||
@RunWith(Parameterized::class)
|
||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
open class UnlockKeyguardToSplitScreenBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
abstract class UnlockKeyguardToSplitScreenBenchmark(override val flicker: LegacyFlickerTest) :
|
||||
SplitScreenBase(flicker) {
|
||||
protected val thisTransition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
@@ -47,14 +47,6 @@ open class UnlockKeyguardToSplitScreenBenchmark(override val flicker: LegacyFlic
|
||||
}
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
override val transition: FlickerBuilder.() -> Unit
|
||||
get() = {
|
||||
defaultSetup(this)
|
||||
defaultTeardown(this)
|
||||
thisTransition(this)
|
||||
}
|
||||
|
||||
companion object {
|
||||
@Parameterized.Parameters(name = "{0}")
|
||||
@JvmStatic
|
||||
|
||||
Reference in New Issue
Block a user