diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-14 19:42:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-14 19:42:53 +0000 |
commit | 4a10a36453290fc71fbc775e8ae5eff625eba799 (patch) | |
tree | 933e53bf3ea78cd0b9d5a6f7a458a7f67b87d781 /tests | |
parent | d8c51ca13c0178baf7f6a9181d74bca4b22f5b99 (diff) | |
parent | 881ffc06e71730db2e6f8e306333241d8ca64bf8 (diff) | |
download | packages_apps_Contacts-4a10a36453290fc71fbc775e8ae5eff625eba799.tar.gz packages_apps_Contacts-4a10a36453290fc71fbc775e8ae5eff625eba799.tar.bz2 packages_apps_Contacts-4a10a36453290fc71fbc775e8ae5eff625eba799.zip |
Merge changes I03bbd1a2,I51939d1b into ub-contactsdialer-i-dev
* changes:
Remove support for invitable account types
Remove some methods from AccountTypeManager
Diffstat (limited to 'tests')
3 files changed, 2 insertions, 191 deletions
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java index f6c2d1b1c..9756a0c50 100644 --- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java +++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java @@ -79,37 +79,6 @@ public class ContactEditorUtilsTest extends AndroidTestCase { mAccountTypes.mAccounts = accounts; } - public void testGetWritableAccountTypeStrings() { - String[] types; - - // 0 writable types - setAccountTypes(); - - types = mTarget.getWritableAccountTypeStrings(); - MoreAsserts.assertEquals(types, new String[0]); - - // 1 writable type - setAccountTypes(TYPE1); - - types = mTarget.getWritableAccountTypeStrings(); - MoreAsserts.assertEquals(Sets.newHashSet(TYPE1.accountType), Sets.newHashSet(types)); - - // 2 writable types - setAccountTypes(TYPE1, TYPE2EX); - - types = mTarget.getWritableAccountTypeStrings(); - MoreAsserts.assertEquals(Sets.newHashSet(TYPE1.accountType, TYPE2EX.accountType), - Sets.newHashSet(types)); - - // 3 writable types + 1 readonly type - setAccountTypes(TYPE1, TYPE2, TYPE2EX, TYPE3); - - types = mTarget.getWritableAccountTypeStrings(); - MoreAsserts.assertEquals( - Sets.newHashSet(TYPE1.accountType, TYPE2.accountType, TYPE2EX.accountType), - Sets.newHashSet(types)); - } - /** * Test for * - {@link ContactEditorUtils#saveDefaultAccount} diff --git a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java index da2e6c3bd..982517b1b 100644 --- a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java +++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java @@ -16,11 +16,8 @@ package com.android.contacts.model; -import static org.mockito.Mockito.when; - import android.accounts.Account; import android.accounts.AccountManager; -import android.content.Context; import android.content.SharedPreferences; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; @@ -29,7 +26,6 @@ import com.android.contacts.model.account.AccountType; import com.android.contacts.model.account.AccountTypeWithDataSet; import com.android.contacts.model.account.AccountWithDataSet; import com.android.contacts.model.account.GoogleAccountType; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -42,6 +38,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.mockito.Mockito.when; + /** * Test case for {@link com.android.contacts.model.AccountTypeManager}. * @@ -67,93 +65,6 @@ public class AccountTypeManagerTest extends AndroidTestCase { MockitoAnnotations.initMocks(this); } - public void testFindAllInvitableAccountTypes() { - final Context c = getContext(); - - // Define account types. - final AccountType typeA = new MockAccountType("type1", null, null); - final AccountType typeB = new MockAccountType("type1", "minus", null); - final AccountType typeC = new MockAccountType("type2", null, "c"); - final AccountType typeD = new MockAccountType("type2", "minus", "d"); - - // Define users - final AccountWithDataSet accountA1 = createAccountWithDataSet("a1", typeA); - final AccountWithDataSet accountC1 = createAccountWithDataSet("c1", typeC); - final AccountWithDataSet accountC2 = createAccountWithDataSet("c2", typeC); - final AccountWithDataSet accountD1 = createAccountWithDataSet("d1", typeD); - - // empty - empty - Map<AccountTypeWithDataSet, AccountType> types = - AccountTypeManagerImpl.findAllInvitableAccountTypes(c, - buildAccounts(), buildAccountTypes()); - assertEquals(0, types.size()); - try { - types.clear(); - fail("Returned Map should be unmodifiable."); - } catch (UnsupportedOperationException ok) { - } - - // No invite support, no accounts - verifyAccountTypes( - buildAccounts(), - buildAccountTypes(typeA, typeB) - /* empty */ - ); - - // No invite support, with accounts - verifyAccountTypes( - buildAccounts(accountA1), - buildAccountTypes(typeA) - /* empty */ - ); - - // With invite support, no accounts - verifyAccountTypes( - buildAccounts(), - buildAccountTypes(typeC) - /* empty */ - ); - - // With invite support, 1 account - verifyAccountTypes( - buildAccounts(accountC1), - buildAccountTypes(typeC), - typeC - ); - - // With invite support, 2 account - verifyAccountTypes( - buildAccounts(accountC1, accountC2), - buildAccountTypes(typeC), - typeC - ); - - // Combinations... - verifyAccountTypes( - buildAccounts(accountA1), - buildAccountTypes(typeA, typeC) - /* empty */ - ); - - verifyAccountTypes( - buildAccounts(accountC1, accountA1), - buildAccountTypes(typeA, typeC), - typeC - ); - - verifyAccountTypes( - buildAccounts(accountC1, accountA1), - buildAccountTypes(typeD, typeA, typeC), - typeC - ); - - verifyAccountTypes( - buildAccounts(accountC1, accountA1, accountD1), - buildAccountTypes(typeD, typeA, typeC, typeB), - typeC, typeD - ); - } - private static AccountWithDataSet createAccountWithDataSet(String name, AccountType type) { return new AccountWithDataSet(name, type.accountType, type.dataSet); } @@ -180,51 +91,6 @@ public class AccountTypeManagerTest extends AndroidTestCase { return result; } - /** - * Executes {@link AccountTypeManagerImpl#findInvitableAccountTypes} and verifies the - * result. - */ - private void verifyAccountTypes( - Collection<AccountWithDataSet> accounts, - Map<AccountTypeWithDataSet, AccountType> types, - AccountType... expectedInvitableTypes - ) { - Map<AccountTypeWithDataSet, AccountType> result = - AccountTypeManagerImpl.findAllInvitableAccountTypes(getContext(), accounts, types); - for (AccountType type : expectedInvitableTypes) { - assertTrue("Result doesn't contain type=" + type.getAccountTypeAndDataSet(), - result.containsKey(type.getAccountTypeAndDataSet())); - } - final int numExcessTypes = result.size() - expectedInvitableTypes.length; - assertEquals("Result contains " + numExcessTypes + " excess type(s)", 0, numExcessTypes); - } - - private static class MockAccountType extends AccountType { - private final String mInviteContactActivityClassName; - - public MockAccountType(String type, String dataSet, String inviteContactActivityClassName) { - accountType = type; - this.dataSet = dataSet; - mInviteContactActivityClassName = inviteContactActivityClassName; - } - - @Override - public String getInviteContactActivityClassName() { - return mInviteContactActivityClassName; - } - - @Override - public boolean isGroupMembershipEditable() { - return false; - } - - @Override - public boolean areContactsWritable() { - return false; - } - } - - public void testGetDefaultAccount_NoAccounts() { assertNull(getDefaultGoogleAccountName()); } diff --git a/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java b/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java index 00686aa15..a69c87741 100644 --- a/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java +++ b/tests/src/com/android/contacts/test/mocks/MockAccountTypeManager.java @@ -76,12 +76,6 @@ public class MockAccountTypeManager extends AccountTypeManager { } @Override - public List<AccountWithDataSet> getSortedAccounts(AccountWithDataSet account, - boolean writableOnly) { - return Arrays.asList(mAccounts); - } - - @Override public List<AccountWithDataSet> getGroupWritableAccounts() { return Arrays.asList(mAccounts); } @@ -90,22 +84,4 @@ public class MockAccountTypeManager extends AccountTypeManager { public Account getDefaultGoogleAccount() { return null; } - - @Override - public Map<AccountTypeWithDataSet, AccountType> getUsableInvitableAccountTypes() { - return Maps.newHashMap(); // Always returns empty - } - - @Override - public List<AccountType> getAccountTypes(boolean writableOnly) { - final List<AccountType> ret = Lists.newArrayList(); - synchronized (this) { - for (AccountType type : mTypes) { - if (!writableOnly || type.areContactsWritable()) { - ret.add(type); - } - } - } - return ret; - } } |