summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2012-07-03 15:12:53 -0700
committerChiao Cheng <chiaocheng@google.com>2012-07-03 15:12:53 -0700
commitb700cfdd4b17e4b8da5cc5482f802c59ddc35c23 (patch)
treebc19224738a38b02cfc6c928e515d1d7c8053201 /tests/src
parent5982547b722b985d23cc8eedd892ffd6d009998d (diff)
downloadandroid_packages_apps_Contacts-b700cfdd4b17e4b8da5cc5482f802c59ddc35c23.tar.gz
android_packages_apps_Contacts-b700cfdd4b17e4b8da5cc5482f802c59ddc35c23.tar.bz2
android_packages_apps_Contacts-b700cfdd4b17e4b8da5cc5482f802c59ddc35c23.zip
Switch libcore.util.Objects to equivalent guava Objects.
Progress towards unbundling. Change-Id: I941014481d9cd63963e55b268642f68145cdf66b
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java7
-rw-r--r--tests/src/com/android/contacts/tests/mocks/MockAccountTypeManager.java3
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
index 9545bc178..6eb3bd73d 100644
--- a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java
@@ -31,17 +31,12 @@ import android.provider.ContactsContract.CommonDataKinds.Website;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.contacts.model.account.AccountType;
-import com.android.contacts.model.account.BaseAccountType;
-import com.android.contacts.model.account.ExternalAccountType;
-import com.android.contacts.model.account.FallbackAccountType;
import com.android.contacts.model.dataitem.DataKind;
import com.android.contacts.tests.R;
+import com.google.common.base.Objects;
import java.util.List;
-import libcore.util.Objects;
-
/**
* Test case for {@link ExternalAccountType}.
*
diff --git a/tests/src/com/android/contacts/tests/mocks/MockAccountTypeManager.java b/tests/src/com/android/contacts/tests/mocks/MockAccountTypeManager.java
index d77425254..ce16743a0 100644
--- a/tests/src/com/android/contacts/tests/mocks/MockAccountTypeManager.java
+++ b/tests/src/com/android/contacts/tests/mocks/MockAccountTypeManager.java
@@ -19,6 +19,7 @@ import com.android.contacts.model.AccountTypeManager;
import com.android.contacts.model.account.AccountType;
import com.android.contacts.model.account.AccountTypeWithDataSet;
import com.android.contacts.model.account.AccountWithDataSet;
+import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -26,8 +27,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import libcore.util.Objects;
-
/**
* A mock {@link AccountTypeManager} class.
*/