From d58ae513b2068f564886b7c18d1922a744c73f01 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Fri, 14 Jan 2022 16:05:35 +0000 Subject: [PATCH 1/2] Don't treat object from test package as system anomaly dialog - OOP test activity has an alertTitle and shouldn't be treated as system anomaly dialog Fix: 214558538 Test: NexusLauncherOutOfProcTests / MemoryTests Change-Id: Ia9c330c3c3f48b43fbada40a3410ccc9fb8bfbb8 --- .../com/android/launcher3/tapl/LauncherInstrumentation.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index f46921f71f..5511770b10 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -430,12 +430,13 @@ public final class LauncherInstrumentation { { final StringBuilder sb = new StringBuilder(); - UiObject2 object = mDevice.findObject(By.res("android", "alertTitle")); + UiObject2 object = + mDevice.findObject(By.res("android", "alertTitle").pkg("android")); if (object != null) { sb.append("TITLE: ").append(object.getText()); } - object = mDevice.findObject(By.res("android", "message")); + object = mDevice.findObject(By.res("android", "message").pkg("android")); if (object != null) { sb.append(" PACKAGE: ").append(object.getApplicationPackage()) .append(" MESSAGE: ").append(object.getText()); From 26a4e5bf26c456e38f8a689c76feaac38bd51539 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 17 Jan 2022 13:08:36 +0000 Subject: [PATCH 2/2] Add screenRecord for PromiseIconUiTest Bug: 202985412 Test: none Change-Id: Iac74290ce872844c8a0f5d0878c8c55f6bb89bb2 --- tests/src/com/android/launcher3/compat/PromiseIconUiTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java index 032a7b4418..f34a29e9f8 100644 --- a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java +++ b/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java @@ -27,6 +27,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator; +import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import org.junit.After; import org.junit.Test; @@ -73,6 +74,7 @@ public class PromiseIconUiTest extends AbstractLauncherUiTest { } @Test + @ScreenRecord // b/202985412 public void testPromiseIcon_addedFromEligibleSession() throws Throwable { final String appLabel = "Test Promise App " + UUID.randomUUID().toString(); final ItemOperator findPromiseApp = (info, view) -> @@ -95,6 +97,7 @@ public class PromiseIconUiTest extends AbstractLauncherUiTest { } @Test + @ScreenRecord // b/202985412 public void testPromiseIcon_notAddedFromIneligibleSession() throws Throwable { final String appLabel = "Test Promise App " + UUID.randomUUID().toString(); final ItemOperator findPromiseApp = (info, view) ->