diff options
| author | Ricky Wai <rickywai@google.com> | 2015-04-14 09:56:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 09:56:32 +0000 |
| commit | 94d605997c8cf36c5446bbc6379c7e397297d07e (patch) | |
| tree | ecd181bce6360e4a72f52c02dad6bfe17996db00 /tests/src/com/android/providers/contacts/util/UserUtilsTest.java | |
| parent | 76f69956794e6ce36ffd2971455be5630becbd41 (diff) | |
| parent | 42d5b79db882739368b163f4d5f61546d134cdbb (diff) | |
| download | packages_providers_ContactsProvider-94d605997c8cf36c5446bbc6379c7e397297d07e.zip packages_providers_ContactsProvider-94d605997c8cf36c5446bbc6379c7e397297d07e.tar.gz packages_providers_ContactsProvider-94d605997c8cf36c5446bbc6379c7e397297d07e.tar.bz2 | |
Merge "Remove caller-id check in enterprise phone and raw contacts entities"
Diffstat (limited to 'tests/src/com/android/providers/contacts/util/UserUtilsTest.java')
| -rw-r--r-- | tests/src/com/android/providers/contacts/util/UserUtilsTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/providers/contacts/util/UserUtilsTest.java b/tests/src/com/android/providers/contacts/util/UserUtilsTest.java index 4417ad5..7482ee6 100644 --- a/tests/src/com/android/providers/contacts/util/UserUtilsTest.java +++ b/tests/src/com/android/providers/contacts/util/UserUtilsTest.java @@ -47,37 +47,37 @@ public class UserUtilsTest extends AndroidTestCase { final MockUserManager um = mActor.mockUserManager; // No corp user. Primary only. - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); // Primary + corp um.setUsers(MockUserManager.PRIMARY_USER, MockUserManager.CORP_USER); um.myUser = MockUserManager.PRIMARY_USER.id; - assertEquals(MockUserManager.CORP_USER.id, UserUtils.getCorpUserId(c)); + assertEquals(MockUserManager.CORP_USER.id, UserUtils.getCorpUserId(c, false)); um.myUser = MockUserManager.CORP_USER.id; - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); // Primary + secondary + corp um.setUsers(MockUserManager.PRIMARY_USER, MockUserManager.SECONDARY_USER, MockUserManager.CORP_USER); um.myUser = MockUserManager.PRIMARY_USER.id; - assertEquals(MockUserManager.CORP_USER.id, UserUtils.getCorpUserId(c)); + assertEquals(MockUserManager.CORP_USER.id, UserUtils.getCorpUserId(c, false)); um.myUser = MockUserManager.CORP_USER.id; - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); um.myUser = MockUserManager.SECONDARY_USER.id; - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); // Primary + secondary um.setUsers(MockUserManager.PRIMARY_USER, MockUserManager.SECONDARY_USER); um.myUser = MockUserManager.PRIMARY_USER.id; - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); um.myUser = MockUserManager.SECONDARY_USER.id; - assertEquals(-1, UserUtils.getCorpUserId(c)); + assertEquals(-1, UserUtils.getCorpUserId(c, false)); } } |