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

Merge "Promote PIP postsubmit tests to presubmit" into sc-dev am: 1f9f16f880

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13852565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7316adbdf6e481ee9ffa8f4d7c708e715d55d80f
This commit is contained in:
Nataniel Borges
2021-03-15 16:06:13 +00:00
committed by Automerger Merge Worker
parent f1d3b37bf4 1f9f16f880
commit ef6f9a0dd1
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipCloseWithSwipeTest.kt
View File

@@ -16,7 +16,7 @@
package com.android.wm.shell.flicker.pip package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit
import android.view.Surface import android.view.Surface
import androidx.test.filters.RequiresDevice import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -51,40 +51,40 @@ class PipCloseWithSwipeTest(testSpec: FlickerTestParameter) : PipCloseTransition
} }
} }
@Postsubmit @Presubmit
@Test @Test
override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible() override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible() override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible() override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible() override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible() override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible()
@Postsubmit @Presubmit
@Test @Test
override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible() override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()
@Postsubmit @Presubmit
@Test @Test
override fun statusBarLayerRotatesScales() = override fun statusBarLayerRotatesScales() =
testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0) testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
@Postsubmit @Presubmit
@Test @Test
override fun noUncoveredRegions() = super.noUncoveredRegions() override fun noUncoveredRegions() = super.noUncoveredRegions()
@Postsubmit @Presubmit
@Test @Test
override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()
} }

18
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipLegacySplitScreenTest.kt
View File

@@ -16,7 +16,7 @@
package com.android.wm.shell.flicker.pip package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit
import android.view.Surface import android.view.Surface
import androidx.test.filters.FlakyTest import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice import androidx.test.filters.RequiresDevice
@@ -78,7 +78,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun pipWindowInsideDisplayBounds() { fun pipWindowInsideDisplayBounds() {
testSpec.assertWm { testSpec.assertWm {
@@ -86,7 +86,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun bothAppWindowsVisible() { fun bothAppWindowsVisible() {
testSpec.assertWmEnd { testSpec.assertWmEnd {
@@ -96,15 +96,15 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
} }
} }
@Postsubmit @Presubmit
@Test @Test
override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible() override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible() override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
fun pipLayerInsideDisplayBounds() { fun pipLayerInsideDisplayBounds() {
testSpec.assertLayers { testSpec.assertLayers {
@@ -112,7 +112,7 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun bothAppLayersVisible() { fun bothAppLayersVisible() {
testSpec.assertLayersEnd { testSpec.assertLayersEnd {
@@ -121,11 +121,11 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t
} }
} }
@Postsubmit @Presubmit
@Test @Test
override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible() override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()
@Postsubmit @Presubmit
@Test @Test
override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible() override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()