Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bdb0f40 authored by vadimt's avatar vadimt
Browse files

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
parent 7ff19aa5

tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);