From 5eead5ee5fa16b0db5fe65c18b0b4709f2f5350c Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Mon, 19 Dec 2022 21:13:56 +0000 Subject: [PATCH] Remove duplicate isTablet initialization this causes all tests to fetch a device state during creation Test: atest FlickerTests Change-Id: Id0cb1861324dcb5c9a09aa549bba7be517ef84c3 --- .../src/com/android/wm/shell/flicker/BaseTest.kt | 12 +----------- .../flicker/pip/EnterPipToOtherOrientationTest.kt | 2 +- .../pip/SetRequestedOrientationWhilePinnedTest.kt | 2 +- .../EnterSplitScreenByDragFromShortcut.kt | 2 +- .../src/com/android/server/wm/flicker/BaseTest.kt | 7 ------- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt index 8465678524f46..122c18d41deed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt @@ -33,7 +33,6 @@ import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible import com.android.server.wm.traces.common.ComponentNameMatcher -import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper import org.junit.Assume import org.junit.Test @@ -49,15 +48,6 @@ constructor( protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(), protected val tapl: LauncherInstrumentation = LauncherInstrumentation() ) { - init { - flicker.scenario.setIsTablet( - WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false) - .currentState - .wmState - .isTablet - ) - } - /** Specification of the test transition to execute */ abstract val transition: FlickerBuilder.() -> Unit @@ -68,7 +58,7 @@ constructor( @FlickerBuilderProvider fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { - setup { flicker.scenario.setIsTablet(wmHelper.currentState.wmState.isTablet) } + setup { flicker.scenario.setIsTablet(tapl.isTablet) } transition() } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt index 2b90243de5a65..a4c8d6f116021 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt @@ -120,7 +120,7 @@ class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flick */ @Before fun setup() { - Assume.assumeFalse(flicker.scenario.isTablet) + Assume.assumeFalse(tapl.isTablet) } /** diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index 157aa9863fdff..7d5dd8939899b 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -103,7 +103,7 @@ open class SetRequestedOrientationWhilePinnedTest(flicker: FlickerTest) : PipTra */ @Before fun setup() { - Assume.assumeFalse(flicker.scenario.isTablet) + Assume.assumeFalse(tapl.isTablet) } @Presubmit diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromShortcut.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromShortcut.kt index abf9426aaa73c..af63f7c26a8cf 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromShortcut.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromShortcut.kt @@ -53,7 +53,7 @@ class EnterSplitScreenByDragFromShortcut(flicker: FlickerTest) : SplitScreenBase @Before fun before() { - Assume.assumeTrue(flicker.scenario.isTablet) + Assume.assumeTrue(tapl.isTablet) } override val transition: FlickerBuilder.() -> Unit diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt index 948288a1fc676..566ec9ab0620b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt @@ -23,7 +23,6 @@ import androidx.test.platform.app.InstrumentationRegistry import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.junit.FlickerBuilderProvider import com.android.server.wm.traces.common.ComponentNameMatcher -import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper import org.junit.Assume import org.junit.AssumptionViolatedException import org.junit.Test @@ -41,12 +40,6 @@ constructor( protected val tapl: LauncherInstrumentation = LauncherInstrumentation() ) { init { - flicker.scenario.setIsTablet( - WindowManagerStateHelper(instrumentation, clearCacheAfterParsing = false) - .currentState - .wmState - .isTablet - ) tapl.setExpectedRotationCheckEnabled(true) }