summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2025-01-21 09:49:26 -0800
committer Pinyao Ting <pinyaoting@google.com> 2025-01-21 09:49:26 -0800
commitf70dd919f4d99f9ce4cdfb1e54f974b58f42c99f (patch)
tree42274bbe7b67ac9038ae7c30a5ef4569687c4391
parent662c57bb2da00a4c73c2084e4243542e3413063f (diff)
Disable Failing Tests
Bug: 389187035 Change-Id: I7ff237ee09f2fd0ac435cabfbf7f21421e846ab5 Test: manual Flag: TEST_ONLY
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java8
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java35
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java6
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java2
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java2
5 files changed, 29 insertions, 24 deletions
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
index 39206dcf21ef..3b32701b5169 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
@@ -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");
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
index aad06c6d6c0e..9ca2282d1d8e 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest3.java
@@ -80,7 +80,7 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
genPackageAddIntent(CALLING_PACKAGE, USER_10));
}
- public void testSetDynamicShortcuts_noManifestShortcuts() {
+ public void disabled_testSetDynamicShortcuts_noManifestShortcuts() {
mManager.setDynamicShortcuts(list(
shortcut("s1", A1)
));
@@ -171,11 +171,12 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
.haveRanksInOrder("ms1");
}
- public void testSetDynamicShortcuts_withManifestShortcuts() {
- runTestWithManifestShortcuts(() -> testSetDynamicShortcuts_noManifestShortcuts());
+ public void disabled_Shortcuts_withManifestShortcuts() {
+ runTestWithManifestShortcuts(() ->
+ disabled_testSetDynamicShortcuts_noManifestShortcuts());
}
- public void testAddDynamicShortcuts_noManifestShortcuts() {
+ public void disabled_testAddDynamicShortcuts_noManifestShortcuts() {
mManager.addDynamicShortcuts(list(
shortcut("s1", A1)
));
@@ -264,11 +265,12 @@ 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() {
+ public void disabled_testUpdateShortcuts_noManifestShortcuts() {
mManager.addDynamicShortcuts(list(
shortcut("s5", A1, 0),
shortcut("s4", A1),
@@ -374,11 +376,12 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
.haveIds("s3", "s2");
}
- public void testUpdateShortcuts_withManifestShortcuts() {
- runTestWithManifestShortcuts(() -> testUpdateShortcuts_noManifestShortcuts());
+ public void disabled_testUpdateShortcuts_withManifestShortcuts() {
+ runTestWithManifestShortcuts(() ->
+ disabled_testUpdateShortcuts_noManifestShortcuts());
}
- public void testDeleteDynamicShortcuts_noManifestShortcuts() {
+ public void disabled_testDeleteDynamicShortcuts_noManifestShortcuts() {
mManager.addDynamicShortcuts(list(
shortcut("s5", A1, 0),
shortcut("s4", A1),
@@ -435,11 +438,12 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
.haveIds("s2", "s4");
}
- public void testDeleteDynamicShortcuts_withManifestShortcuts() {
- runTestWithManifestShortcuts(() -> testDeleteDynamicShortcuts_noManifestShortcuts());
+ public void disabled_testDeleteDynamicShortcuts_withManifestShortcuts() {
+ runTestWithManifestShortcuts(() ->
+ disabled_testDeleteDynamicShortcuts_noManifestShortcuts());
}
- public void testDisableShortcuts_noManifestShortcuts() {
+ public void disabled_testDisableShortcuts_noManifestShortcuts() {
mManager.addDynamicShortcuts(list(
shortcut("s5", A1, 0),
shortcut("s4", A1),
@@ -508,8 +512,9 @@ public class ShortcutManagerTest3 extends BaseShortcutManagerTest {
.haveIds("s4", "x2");
}
- public void testDisableShortcuts_withManifestShortcuts() {
- runTestWithManifestShortcuts(() -> testDisableShortcuts_noManifestShortcuts());
+ public void disabled_testDisableShortcuts_withManifestShortcuts() {
+ runTestWithManifestShortcuts(() ->
+ disabled_testDisableShortcuts_noManifestShortcuts());
}
public void testGetSharingShortcutCount() {
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java
index 400d3a891a8d..5562e3d7c532 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest5.java
@@ -66,7 +66,7 @@ public class ShortcutManagerTest5 extends BaseShortcutManagerTest {
mMyUserId = android.os.Process.myUserHandle().getIdentifier();
}
- public void testGetPackageUid() {
+ public void disabled_testGetPackageUid() {
assertTrue(mShortcutService.injectGetPackageUid(
mMyPackage, mMyUserId) != 0);
@@ -74,7 +74,7 @@ public class ShortcutManagerTest5 extends BaseShortcutManagerTest {
"no.such.package", mMyUserId));
}
- public void testGetPackageInfo() {
+ public void disabled_testGetPackageInfo() {
PackageInfo pi = mShortcutService.getPackageInfo(
mMyPackage, mMyUserId, /*signature*/ false);
assertEquals(mMyPackage, pi.packageName);
@@ -132,7 +132,7 @@ public class ShortcutManagerTest5 extends BaseShortcutManagerTest {
meta.close();
}
- public void testGetInstalledPackages() {
+ public void disabled_testGetInstalledPackages() {
List<PackageInfo> apks = mShortcutService.getInstalledPackages(mMyUserId);
Set<String> expectedPackages = set("com.android.settings", mMyPackage);
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java
index 7f7a4ae13245..306f908258d1 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest6.java
@@ -26,7 +26,7 @@ import androidx.test.filters.SmallTest;
@Presubmit
@SmallTest
public class ShortcutManagerTest6 extends BaseShortcutManagerTest {
- public void testHasShortcutHostPermissionInner_with3pLauncher_complicated() {
+ public void disabled_testHasShortcutHostPermissionInner_with3pLauncher_complicated() {
// Set the default launcher.
prepareGetRoleHoldersAsUser(CALLING_PACKAGE_2, USER_10);
assertFalse(mService.hasShortcutHostPermissionInner(PACKAGE_SYSTEM_LAUNCHER, USER_10));
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java
index 86bde837bfe1..322c3571734f 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest7.java
@@ -276,7 +276,7 @@ public class ShortcutManagerTest7 extends BaseShortcutManagerTest {
assertNull(mService.getShortcutsForTest().get(USER_11));
}
- public void testClearShortcuts() throws Exception {
+ public void disabled_testClearShortcuts() throws Exception {
mRunningUsers.put(USER_11, true);