From 1bdb0f4046155ffb56a995aef942fc1e3367d0eb Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 3 May 2019 12:56:13 -0700 Subject: [PATCH] Enable BindWidgetTest, RequestPinItemTest Comparing only widget provider class names, as package names (sometimes) switch to the test package, not to the ones in Launcher. Bug: 131116593 Change-Id: Ieeed69432303a86fcefb194d509cdaf9d4513f3a --- .../launcher3/ui/widget/AddConfigWidgetTest.java | 3 ++- .../android/launcher3/ui/widget/AddWidgetTest.java | 3 ++- .../android/launcher3/ui/widget/BindWidgetTest.java | 6 +++--- .../launcher3/ui/widget/RequestPinItemTest.java | 11 +++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index 06a8bca13e..5eb5f19928 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -156,7 +156,8 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { @Override public boolean evaluate(ItemInfo info, View view) { return info instanceof LauncherAppWidgetInfo && - ((LauncherAppWidgetInfo) info).providerName.equals(mWidgetInfo.provider) && + ((LauncherAppWidgetInfo) info).providerName.getClassName().equals( + mWidgetInfo.provider.getClassName()) && ((LauncherAppWidgetInfo) info).appWidgetId == mWidgetId; } } diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java index e802acb62c..0061568cce 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java @@ -82,7 +82,8 @@ public class AddWidgetTest extends AbstractLauncherUiTest { @Override public boolean evaluate(ItemInfo info, View view) { return info instanceof LauncherAppWidgetInfo && - ((LauncherAppWidgetInfo) info).providerName.equals(widgetInfo.provider); + ((LauncherAppWidgetInfo) info).providerName.getClassName().equals( + widgetInfo.provider.getClassName()); } }).call()); } diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index af50190b94..874ff1995b 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -123,7 +123,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest { verifyWidgetPresent(info); } - @Test @Ignore // b/131116593 + @Test public void testUnboundWidget_removed() { LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false); LauncherAppWidgetInfo item = createWidgetInfo(info, false); @@ -143,7 +143,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest { assertFalse(mDevice.findObject(new UiSelector().description(info.label)).exists()); } - @Test @Ignore // b/131116593 + @Test public void testPendingWidget_autoRestored() { // A non-restored widget with no config screen gets restored automatically. LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false); @@ -181,7 +181,7 @@ public class BindWidgetTest extends AbstractLauncherUiTest { LauncherSettings.Favorites.APPWIDGET_ID)))); } - @Test @Ignore // b/131116593 + @Test public void testPendingWidget_notRestored_removed() { LauncherAppWidgetInfo item = getInvalidWidgetInfo(); item.restoreStatus = LauncherAppWidgetInfo.FLAG_ID_NOT_VALID diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 65d8a826f1..b66fa8afbc 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -80,7 +80,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { @Test public void testEmpty() throws Throwable { /* needed while the broken tests are being fixed */ } - @Test @Ignore // b/131116593 + @Test public void testPinWidgetNoConfig() throws Throwable { runTest("pinWidgetNoConfig", true, new ItemOperator() { @Override @@ -93,7 +93,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { }); } - @Test @Ignore // b/131116593 + @Test public void testPinWidgetNoConfig_customPreview() throws Throwable { // Command to set custom preview Intent command = RequestPinItemActivity.getCommandIntent( @@ -111,7 +111,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { }, command); } - @Test @Ignore // b/131116593 + @Test public void testPinWidgetWithConfig() throws Throwable { runTest("pinWidgetWithConfig", true, new ItemOperator() { @Override @@ -124,7 +124,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { }); } - @Test @Ignore // b/131116593 + @Test public void testPinShortcut() throws Throwable { // Command to set the shortcut id Intent command = RequestPinItemActivity.getCommandIntent( @@ -181,8 +181,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { // Accept confirmation: BlockingBroadcastReceiver resultReceiver = new BlockingBroadcastReceiver(mCallbackAction); - mDevice.wait(Until.findObject(By.text(mTargetContext.getString( - R.string.place_automatically).toUpperCase())), DEFAULT_UI_TIMEOUT).click(); + mDevice.wait(Until.findObject(By.text("Add automatically")), DEFAULT_UI_TIMEOUT).click(); Intent result = resultReceiver.blockingGetIntent(); assertNotNull(result); mAppWidgetId = result.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);