summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-01-05 17:00:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-05 17:00:56 +0000
commit68a2bfb8d1e674b4b4731eed4de69ef581a44655 (patch)
tree21f34171081fe7ede15d55e2a5c108cb4c3443a1 /tests
parent9abf82bbe15d264618f4c523dd2a4cc733c3070f (diff)
parente31b0ea8b61d5744921ff7491d5dbe1a8273c05f (diff)
downloadandroid_packages_apps_ContactsCommon-68a2bfb8d1e674b4b4731eed4de69ef581a44655.tar.gz
android_packages_apps_ContactsCommon-68a2bfb8d1e674b4b4731eed4de69ef581a44655.tar.bz2
android_packages_apps_ContactsCommon-68a2bfb8d1e674b4b4731eed4de69ef581a44655.zip
Merge "Use carrier presence when showing the video call icon." into ub-contactsdialer-b-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/contacts/common/model/ContactLoaderTest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java b/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
index 1c65d7b4..094e51cd 100644
--- a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
@@ -154,6 +154,7 @@ public class ContactLoaderTest extends LoaderTestCase {
assertEquals(lookupUri, contact.getLookupUri());
assertEquals(1, contact.getRawContacts().size());
assertEquals(1, contact.getStatuses().size());
+ assertEquals(1, contact.getRawContacts().get(0).getDataItems().get(0).getCarrierPresence());
mContactsProvider.verify();
}
@@ -342,6 +343,7 @@ public class ContactLoaderTest extends LoaderTestCase {
Data.TIMES_USED,
Data.LAST_TIME_USED,
+ Data.CARRIER_PRESENCE
})
.withSortOrder(Contacts.Entity.RAW_CONTACT_ID)
.returnRow(
@@ -382,7 +384,8 @@ public class ContactLoaderTest extends LoaderTestCase {
0,
0,
- 0
+ 0,
+ Data.CARRIER_PRESENCE_VT_CAPABLE
);
}