Fix CTS test failing on TV
The testSetFeatureDrawable test was failing on TV because it used to reply on the
Window.FEATURE_OPTIONS_PANEL always being present, but that was recently disabled by
default on TV targets.
Changed the test to now use FEATURE_LEFT_ICON instead.
Also, changed the tests to run on the UI thread.
Bug: 19184480
Change-Id: I7d826839c47fb8fecdfdeb5c241c9f0b653a3546
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 6df2eee..feb4940 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -673,19 +673,36 @@
mInstrumentation.waitForIdleSync();
}
- public void testSetFeatureDrawableUri() {
+ public void testSetFeatureDrawableUri() throws Throwable {
startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
- mActivity.getDialog().setFeatureDrawableUri(0, Uri.parse("http://www.google.com"));
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.getDialog().setFeatureDrawableUri(Window.FEATURE_LEFT_ICON,
+ Uri.parse("http://www.google.com"));
+ }
+ });
+ mInstrumentation.waitForIdleSync();
}
- public void testSetFeatureDrawable() {
+ public void testSetFeatureDrawable() throws Throwable {
startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
- mActivity.getDialog().setFeatureDrawable(0, new MockDrawable());
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.getDialog().setFeatureDrawable(Window.FEATURE_LEFT_ICON,
+ new MockDrawable());
+ }
+ });
+ mInstrumentation.waitForIdleSync();
}
- public void testSetFeatureDrawableAlpha() {
+ public void testSetFeatureDrawableAlpha() throws Throwable {
startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
- mActivity.getDialog().setFeatureDrawableAlpha(0, 0);
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mActivity.getDialog().setFeatureDrawableAlpha(Window.FEATURE_LEFT_ICON, 0);
+ }
+ });
+ mInstrumentation.waitForIdleSync();
}
public void testGetLayoutInflater() {
