Only run PipLegacySplitScreenTest when it is using legacy split
Ignore PipLegacySplitScreenTest if the system is not using legacy split by checking config_useLegacySplit which is set to false since sc-v2 or on jumbojack device. The flag should be deprecated along with legacy split screen. Bug: 189245318 Test: atest PipLegacySplitScreenTest Change-Id: I6243f0b0990265c96867cb7ee87b6bd0b90330c7
This commit is contained in:
@@ -27,13 +27,15 @@ import com.android.server.wm.flicker.annotation.Group3
|
||||
import com.android.server.wm.flicker.dsl.FlickerBuilder
|
||||
import com.android.server.wm.flicker.helpers.launchSplitScreen
|
||||
import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
|
||||
import com.android.wm.shell.flicker.helpers.ImeAppHelper
|
||||
import com.android.wm.shell.flicker.helpers.FixedAppHelper
|
||||
import com.android.server.wm.flicker.repetitions
|
||||
import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome
|
||||
import com.android.wm.shell.flicker.helpers.BaseAppHelper.Companion.isShellTransitionsEnabled
|
||||
import com.android.wm.shell.flicker.helpers.FixedAppHelper
|
||||
import com.android.wm.shell.flicker.helpers.ImeAppHelper
|
||||
import com.android.wm.shell.flicker.helpers.SplitScreenHelper
|
||||
import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP
|
||||
import org.junit.Assume.assumeFalse
|
||||
import org.junit.Assume.assumeTrue
|
||||
import org.junit.Before
|
||||
import org.junit.FixMethodOrder
|
||||
import org.junit.Test
|
||||
@@ -56,6 +58,8 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
|
||||
|
||||
@Before
|
||||
open fun setup() {
|
||||
// Only run legacy split tests when the system is using legacy split screen.
|
||||
assumeTrue(SplitScreenHelper.isUsingLegacySplit())
|
||||
// Legacy split is having some issue with Shell transition, and will be deprecated soon.
|
||||
assumeFalse(isShellTransitionsEnabled())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user