diff options
author | 2022-12-30 10:45:43 +0000 | |
---|---|---|
committer | 2022-12-30 10:45:43 +0000 | |
commit | 9a4da64c3f7b535ab518d81cd6b3a25c4b46a61c (patch) | |
tree | 6b4ecdbd6ead1261feba2b1d7c685c621ea89642 /services/robotests/backup | |
parent | 5f6c2712ff643ea8ad5cf65160177e208e19bdf8 (diff) |
Implement shadow for UserManager#getMainUser
Not having the implementation causes B&R robolectric tests fail with a NPE.
Bug: 263981306
Test: atest BackupFrameworksServicesRoboTests
Change-Id: I47bf7ba42cf3bd23e472f8c9a21e4e657053ad42
Diffstat (limited to 'services/robotests/backup')
3 files changed, 9 insertions, 3 deletions
diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index 159285a5ce5e..2878743d8a5f 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -67,6 +67,7 @@ import com.android.server.testing.shadows.ShadowBinder; import com.android.server.testing.shadows.ShadowKeyValueBackupJob; import com.android.server.testing.shadows.ShadowKeyValueBackupTask; import com.android.server.testing.shadows.ShadowSystemServiceRegistry; +import com.android.server.testing.shadows.ShadowUserManager; import org.junit.After; import org.junit.Before; @@ -101,7 +102,8 @@ import java.util.List; shadows = { ShadowBackupEligibilityRules.class, ShadowApplicationPackageManager.class, - ShadowSystemServiceRegistry.class + ShadowSystemServiceRegistry.class, + ShadowUserManager.class }) @Presubmit public class UserBackupManagerServiceTest { diff --git a/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java b/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java index e49425b00322..ed7bc74e7ceb 100644 --- a/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java +++ b/services/robotests/backup/src/com/android/server/backup/internal/SetupObserverTest.java @@ -33,6 +33,7 @@ import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.testing.BackupManagerServiceTestUtils; import com.android.server.testing.shadows.ShadowApplicationPackageManager; import com.android.server.testing.shadows.ShadowSystemServiceRegistry; +import com.android.server.testing.shadows.ShadowUserManager; import org.junit.Before; import org.junit.Test; @@ -56,7 +57,8 @@ import java.io.File; shadows = { ShadowApplicationPackageManager.class, ShadowJobScheduler.class, - ShadowSystemServiceRegistry.class + ShadowSystemServiceRegistry.class, + ShadowUserManager.class }) @Presubmit public class SetupObserverTest { diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index 6af726910226..1abcf38baff9 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -128,6 +128,7 @@ import com.android.server.testing.shadows.ShadowBackupDataInput; import com.android.server.testing.shadows.ShadowBackupDataOutput; import com.android.server.testing.shadows.ShadowEventLog; import com.android.server.testing.shadows.ShadowSystemServiceRegistry; +import com.android.server.testing.shadows.ShadowUserManager; import com.google.common.base.Charsets; import com.google.common.truth.IterableSubject; @@ -175,7 +176,8 @@ import java.util.stream.Stream; ShadowBackupDataOutput.class, ShadowEventLog.class, ShadowQueuedWork.class, - ShadowSystemServiceRegistry.class + ShadowSystemServiceRegistry.class, + ShadowUserManager.class }) @Presubmit public class KeyValueBackupTaskTest { |