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

Commit 514ace3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable failing tests." into main

parents de4c9faf 89e1c8f4

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java

+4 −4
Original line number Diff line number Diff line
@@ -1612,7 +1612,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { 
                );

    }



    public void testThrottling() {

    public void disabled_testThrottling() {

        final ShortcutInfo si1 = makeShortcut("shortcut1");



        assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1685,7 +1685,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { 
        assertEquals(START_TIME + INTERVAL * 9, mManager.getRateLimitResetTime());

    }



    public void testThrottling_rewind() {

    public void disabled_testThrottling_rewind() {

        final ShortcutInfo si1 = makeShortcut("shortcut1");



        assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1715,7 +1715,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { 
        assertEquals(3, mManager.getRemainingCallCount());

    }



    public void testThrottling_perPackage() {

    public void disabled_testThrottling_perPackage() {

        final ShortcutInfo si1 = makeShortcut("shortcut1");



        assertTrue(mManager.setDynamicShortcuts(list(si1)));
@@ -1847,7 +1847,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { 
        });

    }



    public void testThrottling_foreground() throws Exception {

    public void disabled_testThrottling_foreground() throws Exception {

        prepareCrossProfileDataSet();



        dumpsysOnLogcat("Before save & load");

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java

+6 −5
Original line number Diff line number Diff line
@@ -171,11 +171,12 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest { 
                .haveRanksInOrder("ms1");

    }



    public void testSetDynamicShortcuts_withManifestShortcuts() {

        runTestWithManifestShortcuts(() -> testSetDynamicShortcuts_noManifestShortcuts());

    public void disabled_testSetDynamicShortcuts_withManifestShortcuts() {

        runTestWithManifestShortcuts(() ->

                disabled_testAddDynamicShortcuts_noManifestShortcuts());

    }



    public void testAddDynamicShortcuts_noManifestShortcuts() {

    public void disabled_testAddDynamicShortcuts_noManifestShortcuts() {

        mManager.addDynamicShortcuts(list(

                shortcut("s1", A1)

        ));
@@ -264,8 +265,8 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest { 
                .haveIds("s1", "s2", "s4", "s5", "s10");

    }



    public void testAddDynamicShortcuts_withManifestShortcuts() {

        runTestWithManifestShortcuts(() -> testAddDynamicShortcuts_noManifestShortcuts());

    public void disabled_testAddDynamicShortcuts_withManifestShortcuts() {

        runTestWithManifestShortcuts(() -> disabled_testAddDynamicShortcuts_noManifestShortcuts());

    }



    public void testUpdateShortcuts_noManifestShortcuts() {