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

Commit 2e633303 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Annotating ignored tests with requests to enable them" into ub-launcher3-qt-dev

parents 736982d7 677abe21

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


    @Test

    @PortraitLandscape

    @Ignore

    @Ignore // Enable after b/131115533

    public void testPressRecentAppsLauncherAndGetOverview() throws RemoteException {

        mDevice.pressRecentApps();

        waitForState("Launcher internal state didn't switch to Overview", LauncherState.OVERVIEW);

robolectric_tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public class CacheDataUpdatedTaskTest extends BaseModelUpdateTaskTestCase { 
    }



    @Test

    @Ignore("This test fails with resource errors")

    @Ignore("This test fails with resource errors") // b/131115553

    public void testCacheUpdate_update_apps() throws Exception {

        // Clear all icons from apps list so that its easy to check what was updated

        for (AppInfo info : allAppsList.data) {
@@ -66,7 +66,7 @@ public class CacheDataUpdatedTaskTest extends BaseModelUpdateTaskTestCase { 
    }



    @Test

    @Ignore("This test fails with resource errors")

    @Ignore("This test fails with resource errors") // b/131115553

    public void testSessionUpdate_ignores_normal_apps() throws Exception {

        executeTaskForTest(newTask(CacheDataUpdatedTask.OP_SESSION_UPDATE, "app1"));
@@ -75,7 +75,7 @@ public class CacheDataUpdatedTaskTest extends BaseModelUpdateTaskTestCase { 
    }



    @Test

    @Ignore("This test fails with resource errors")

    @Ignore("This test fails with resource errors") // b/131115553

    public void testSessionUpdate_updates_pending_apps() throws Exception {

        executeTaskForTest(newTask(CacheDataUpdatedTask.OP_SESSION_UPDATE, "app3"));

tests/src/com/android/launcher3/ui/DefaultLayoutProviderTest.java

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testCustomProfileLoaded_with_icon_on_hotseat() throws Exception {

        writeLayout(new LauncherLayoutBuilder().atHotseat(0).putApp(SETTINGS_APP, SETTINGS_APP));
@@ -86,7 +86,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testCustomProfileLoaded_with_widget() throws Exception {

        // A non-restored widget with no config screen gets restored automatically.

        LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false);
@@ -106,7 +106,7 @@ public class DefaultLayoutProviderTest extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testCustomProfileLoaded_with_folder() throws Exception {

        writeLayout(new LauncherLayoutBuilder().atHotseat(0).putFolder(android.R.string.copy)

                .addApp(SETTINGS_APP, SETTINGS_APP)

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

+4 −4
Original line number Diff line number Diff line
@@ -71,25 +71,25 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { 
    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testWidgetConfig() throws Throwable {

        runTest(false, true);

    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testWidgetConfig_rotate() throws Throwable {

        runTest(true, true);

    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testConfigCancelled() throws Throwable {

        runTest(false, false);

    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testConfigCancelled_rotate() throws Throwable {

        runTest(true, false);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ public class AddWidgetTest extends AbstractLauncherUiTest { 
    @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind();



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testDragIcon_portrait() throws Throwable {

        lockRotation(true);

        performTest();

    }



    @Test

    @Ignore

    @Ignore // Convert test to TAPL and enable them; b/131116002

    public void testDragIcon_landscape() throws Throwable {

        lockRotation(false);

        performTest();