PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable BindWidgetTest, RequestPinItemTest

Browse Source 
am: 1bdb0f4046

Change-Id: Ic590ee4334d18a810fe97ede7babad58975ab7e3
This commit is contained in:
vadimt
2019-05-03 15:21:19 -07:00
committed by android-build-merger
parent f3aed6d22b 1bdb0f4046
commit 6abdf7bd10
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+2 -1
View File
@@ -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;
}
}
tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+2 -1
View File
@@ -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());
}
tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+3 -3
View File
@@ -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
tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java
+5 -6
View File
@@ -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);