From fb7d3be548fb8e8f9c1e847174c716dbfa2ebbcf Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Thu, 2 Feb 2023 23:56:36 +0000 Subject: [PATCH] Make testRemoveUserByHandle_ThrowsException fail faster. Currently UserManagerTest#testRemoveUserByHandle_ThrowsException uses the helper 'removeUser' method which registers for a BlockingBroadcastReceiver and since we're not expecting a broadcast it only fails after the timeout. This CL removes that unnecessary step and decreases this test method's duration from 3 minutes to 1 ms. Test: atest UserManagerTest#testRemoveUserByHandle_ThrowsException Change-Id: I9302054cb53b1e0027bb2bcb9da74d98f390f2ed --- .../src/com/android/server/pm/UserManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index c760efdae2632..8a292cbab0f55 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -302,7 +302,7 @@ public final class UserManagerTest { @MediumTest @Test public void testRemoveUserByHandle_ThrowsException() { - assertThrows(IllegalArgumentException.class, () -> removeUser(null)); + assertThrows(IllegalArgumentException.class, () -> mUserManager.removeUser(null)); } @MediumTest