From c24dfb6876bcc0417c3cf739568e931b3d4650cd Mon Sep 17 00:00:00 2001 From: Yuncheol Heo Date: Wed, 9 Sep 2020 17:09:10 -0700 Subject: [PATCH] Annotate some FlickerTests to run in the presubmit. - Excluded some tests which have the flakiness bigger than 1%: https://screenshot.googleplex.com/54j3Nb3Gv5UDw2z.png com.android.server.wm.flicker.launch.OpenAppWarmTest com.android.server.wm.flicker.ime.CloseImeAutoOpenWindowToAppTest com.android.server.wm.flicker.splitscreen.OpenAppToSplitScreenTest com.android.server.wm.flicker.rotation.ChangeAppRotationTest Bug: 167422027 Test: Check if the given tests are running in presubmit. Change-Id: Id9d579bb12de010013d820ef15cab387429db48b --- tests/FlickerTests/Android.bp | 6 ++++-- .../wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt | 2 ++ .../server/wm/flicker/ime/CloseImeWindowToAppTest.kt | 2 ++ .../server/wm/flicker/ime/CloseImeWindowToHomeTest.kt | 2 ++ .../com/android/server/wm/flicker/ime/OpenImeWindowTest.kt | 2 ++ .../com/android/server/wm/flicker/launch/OpenAppColdTest.kt | 2 ++ .../wm/flicker/splitscreen/SplitScreenToLauncherTest.kt | 2 ++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp index a53ea16ba7c48..d430db525f4c3 100644 --- a/tests/FlickerTests/Android.bp +++ b/tests/FlickerTests/Android.bp @@ -29,7 +29,8 @@ android_test { "flickerlib", "truth-prebuilt", "launcher-helper-lib", - "launcher-aosp-tapl" + "launcher-aosp-tapl", + "platform-test-annotations", ], } @@ -50,6 +51,7 @@ android_test { "truth-prebuilt", "app-helpers-core", "launcher-helper-lib", - "launcher-aosp-tapl" + "launcher-aosp-tapl", + "platform-test-annotations", ], } \ No newline at end of file diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index b64811b2767d0..c1ba21a2977a9 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.ime +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.dsl.flicker @@ -39,6 +40,7 @@ import org.junit.runners.Parameterized * Test IME window closing back to app window transitions. * To run this test: `atest FlickerTests:CloseImeWindowToAppTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt index 0940c192517e5..2c00722703788 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.ime +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.NonRotationTestBase @@ -39,6 +40,7 @@ import org.junit.runners.Parameterized * Test IME window closing back to app window transitions. * To run this test: `atest FlickerTests:CloseImeWindowToAppTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index c2e87dbbf24b2..4697adcbce80f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.ime +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.NonRotationTestBase @@ -40,6 +41,7 @@ import org.junit.runners.Parameterized * Test IME window closing to home transitions. * To run this test: `atest FlickerTests:CloseImeWindowToHomeTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index 11ccb69c46cf2..2caa8f399be76 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.ime +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.NonRotationTestBase @@ -39,6 +40,7 @@ import org.junit.runners.Parameterized * Test IME window opening transitions. * To run this test: `atest FlickerTests:OpenImeWindowTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 17590723da8de..2c9c8ba75a109 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.dsl.flicker @@ -38,6 +39,7 @@ import org.junit.runners.Parameterized * Test cold launch app from launcher. * To run this test: `atest FlickerTests:OpenAppColdTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt index 87c863338edb9..7447bdae9abe8 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/SplitScreenToLauncherTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.splitscreen +import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.NonRotationTestBase @@ -43,6 +44,7 @@ import org.junit.runners.Parameterized * Test open app to split screen. * To run this test: `atest FlickerTests:SplitScreenToLauncherTest` */ +@Presubmit @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING)