Snap for 4384531 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: I06099c50eb5f4c5791fab1e6055cca20fb367c6d

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
index ea9b5460..c096d7d2 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
@@ -17,6 +17,7 @@ package com.android.tv.testing.uihelper;
 
 import static com.android.tv.testing.uihelper.Constants.FOCUSED_VIEW;
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 
 import android.support.test.uiautomator.By;
@@ -38,6 +39,12 @@ public final class UiDeviceAsserts {
         assertEquals("Has " + bySelector, expected, uiDevice.hasObject(bySelector));
     }
 
+    public static void assertWaitUntilFocused(UiDevice uiDevice, BySelector bySelector) {
+        UiObject2 uiObject = uiDevice.findObject(bySelector);
+        assertNotNull(uiObject);
+        assertTrue(uiObject.wait(Until.focused(true), Constants.MAX_FOCUSED_DELAY_MILLIS));
+    }
+
     /**
      * Assert that {@code searchCondition} becomes true within
      * {@value Constants#MAX_SHOW_DELAY_MILLIS} milliseconds.