From 44515f42c0e532e4121f7c6019161cfbd37b3ba1 Mon Sep 17 00:00:00 2001 From: vadimt Date: Tue, 23 Jul 2019 12:36:05 -0700 Subject: [PATCH] Allowing both normal-case and uppercase versions of widget prompt The prompt is "Add automatically" Bug: 138152531 Change-Id: I5f1a15563e1e11768579711108a28070b72b4454 --- .../android/launcher3/tapl/AddToHomeScreenPrompt.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java index 7f561a2af3..6813400b87 100644 --- a/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java +++ b/tests/tapl/com/android/launcher3/tapl/AddToHomeScreenPrompt.java @@ -19,7 +19,11 @@ package com.android.launcher3.tapl; import androidx.test.uiautomator.By; import androidx.test.uiautomator.UiObject2; +import java.util.regex.Pattern; + public class AddToHomeScreenPrompt { + private static final Pattern ADD_AUTOMATICALLY = + Pattern.compile("ADD AUTOMATICALLY|Add automatically"); private final LauncherInstrumentation mLauncher; private final UiObject2 mWidgetCell; @@ -33,9 +37,6 @@ public class AddToHomeScreenPrompt { public void addAutomatically() { mLauncher.waitForObjectInContainer( mWidgetCell.getParent().getParent().getParent().getParent(), - By.text(LauncherInstrumentation.isAvd() - ? "ADD AUTOMATICALLY" - : "Add automatically")). - click(); + By.text(ADD_AUTOMATICALLY)).click(); } }