Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add FlakyTest annotation on correct test"

Browse Source
This commit is contained in:
Chilun Huang
2022-12-21 12:02:43 +00:00
committed by Android (Google) Code Review
parent 4f53c172db 33cea00de9
commit 82dba3b4b1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt
View File

@@ -85,7 +85,18 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {
@Test
fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
@Presubmit @Test fun primaryAppLayerKeepVisible() = flicker.layerKeepVisible(primaryApp)
@Presubmit
@Test
fun primaryAppLayerKeepVisible() {
Assume.assumeFalse(isShellTransitionsEnabled)
flicker.layerKeepVisible(primaryApp)
}
@FlakyTest(bugId = 263213649)
@Test fun primaryAppLayerKeepVisible_ShellTransit() {
Assume.assumeTrue(isShellTransitionsEnabled)
flicker.layerKeepVisible(primaryApp)
}
@Presubmit
@Test
@@ -99,17 +110,7 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {
}
}
@Presubmit
@Test fun primaryAppWindowKeepVisible() {
Assume.assumeFalse(isShellTransitionsEnabled)
flicker.appWindowKeepVisible(primaryApp)
}
@FlakyTest(bugId = 263213649)
@Test fun primaryAppWindowKeepVisible_ShellTransit() {
Assume.assumeTrue(isShellTransitionsEnabled)
flicker.appWindowKeepVisible(primaryApp)
}
@Presubmit @Test fun primaryAppWindowKeepVisible() = flicker.appWindowKeepVisible(primaryApp)
@Presubmit
@Test