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

Merge "Move passing postsubmit tests to presubmit" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-28 17:57:59 +00:00
committed by Android (Google) Code Review
parent 4baae1f703 4a69f3a27f
commit 83e668b241
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt
View File

@@ -17,16 +17,25 @@
package com.android.server.wm.flicker.ime package com.android.server.wm.flicker.ime
import android.app.Instrumentation import android.app.Instrumentation
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit
import android.platform.test.annotations.RequiresDevice
import android.view.Surface import android.view.Surface
import android.view.WindowManagerPolicyConstants import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.wm.flicker.* import com.android.server.wm.flicker.FlickerBuilderProvider
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.annotation.Group2 import com.android.server.wm.flicker.annotation.Group2
import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.* import com.android.server.wm.flicker.helpers.FixedOrientationAppHelper
import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
import com.android.server.wm.flicker.helpers.setRotation
import com.android.server.wm.flicker.navBarLayerRotatesAndScales
import com.android.server.wm.flicker.navBarWindowIsVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
import com.android.server.wm.flicker.statusBarWindowIsVisible
import org.junit.FixMethodOrder import org.junit.FixMethodOrder
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
@@ -67,26 +76,26 @@ class OpenImeWindowFromFixedOrientationAppTest(private val testSpec: FlickerTest
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible() fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()
@Postsubmit @Presubmit
@Test @Test
fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible() fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()
@Postsubmit @Presubmit
@Test @Test
fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible() fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible()
@Postsubmit @Presubmit
@Test @Test
fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales() fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()
@FlakyTest(bugId = 206753786) @FlakyTest(bugId = 206753786)
fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales() fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()
@Postsubmit @Presubmit
@Test @Test
fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible() fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible()

26
tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt
View File

@@ -17,15 +17,23 @@
package com.android.server.wm.flicker.ime package com.android.server.wm.flicker.ime
import android.app.Instrumentation import android.app.Instrumentation
import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit
import android.platform.test.annotations.RequiresDevice import android.platform.test.annotations.RequiresDevice
import android.view.Surface import android.view.Surface
import android.view.WindowManagerPolicyConstants import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.wm.flicker.* import com.android.server.wm.flicker.FlickerBuilderProvider
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.annotation.Group4 import com.android.server.wm.flicker.annotation.Group4
import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper import com.android.server.wm.flicker.helpers.ImeAppAutoFocusHelper
import com.android.server.wm.flicker.navBarLayerIsVisible
import com.android.server.wm.flicker.navBarWindowIsVisible
import com.android.server.wm.flicker.statusBarLayerIsVisible
import com.android.server.wm.flicker.statusBarWindowIsVisible
import com.android.server.wm.traces.common.FlickerComponentName import com.android.server.wm.traces.common.FlickerComponentName
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
import org.junit.Assume.assumeTrue import org.junit.Assume.assumeTrue
@@ -69,32 +77,32 @@ class OpenImeWindowToOverViewTest(private val testSpec: FlickerTestParameter) {
} }
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible() fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()
@Postsubmit @Presubmit
@Test @Test
fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible() fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()
@Postsubmit @Presubmit
@Test @Test
fun imeWindowIsAlwaysVisible() { fun imeWindowIsAlwaysVisible() {
testSpec.imeWindowIsAlwaysVisible() testSpec.imeWindowIsAlwaysVisible()
} }
@Postsubmit @FlakyTest(bugId = 227189877)
@Test @Test
fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible() fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()
@Postsubmit @FlakyTest(bugId = 206753786)
@Test @Test
fun statusBarLayerIsVisibleInPortrait() { fun statusBarLayerIsVisibleInPortrait() {
assumeFalse(testSpec.isLandscapeOrSeascapeAtStart) assumeFalse(testSpec.isLandscapeOrSeascapeAtStart)
testSpec.statusBarLayerIsVisible() testSpec.statusBarLayerIsVisible()
} }
@Postsubmit @Presubmit
@Test @Test
fun statusBarLayerIsInVisibleInLandscape() { fun statusBarLayerIsInVisibleInLandscape() {
assumeTrue(testSpec.isLandscapeOrSeascapeAtStart) assumeTrue(testSpec.isLandscapeOrSeascapeAtStart)
@@ -106,7 +114,7 @@ class OpenImeWindowToOverViewTest(private val testSpec: FlickerTestParameter) {
} }
} }
@Postsubmit @Presubmit
@Test @Test
fun imeLayerIsVisibleAndAssociatedWithAppWidow() { fun imeLayerIsVisibleAndAssociatedWithAppWidow() {
testSpec.assertLayersStart { testSpec.assertLayersStart {