diff options
| -rw-r--r-- | tests/src/com/android/providers/contacts/CallLogProviderTest.java | 7 | ||||
| -rw-r--r-- | tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java index 247da7dc..8ff0c5b2 100644 --- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java +++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java @@ -16,9 +16,8 @@ package com.android.providers.contacts; -import com.android.internal.telephony.CallerInfo; +import android.telephony.CallerInfo; import com.android.internal.telephony.PhoneConstants; -import com.android.providers.contacts.CallLogDatabaseHelper.DbProperties; import com.android.providers.contacts.testutil.CommonDatabaseUtils; import android.content.ComponentName; @@ -187,7 +186,7 @@ public class CallLogProviderTest extends BaseContactsProvider2Test { public void testAddCall() { CallerInfo ci = new CallerInfo(); - ci.name = "1-800-GOOG-411"; + ci.setName("1-800-GOOG-411"); ci.numberType = Phone.TYPE_CUSTOM; ci.numberLabel = "Directory"; final ComponentName sComponentName = new ComponentName( @@ -209,7 +208,7 @@ public class CallLogProviderTest extends BaseContactsProvider2Test { values.put(Calls.NUMBER_PRESENTATION, Calls.PRESENTATION_ALLOWED); values.put(Calls.DATE, 2000); values.put(Calls.DURATION, 40); - values.put(Calls.CACHED_NAME, ci.name); + values.put(Calls.CACHED_NAME, ci.getName()); values.put(Calls.CACHED_NUMBER_TYPE, (String) null); values.put(Calls.CACHED_NUMBER_LABEL, (String) null); values.put(Calls.COUNTRY_ISO, "us"); diff --git a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java index 867f01f8..90ed93e0 100644 --- a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java +++ b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java @@ -22,7 +22,7 @@ import android.net.Uri; import android.provider.ContactsContract.RawContacts; import android.test.suitebuilder.annotation.MediumTest; -import com.android.internal.telephony.CallerInfo; +import android.telephony.CallerInfo; import com.android.providers.contacts.testutil.DataUtil; /** @@ -49,9 +49,9 @@ public class CallerInfoIntegrationTest extends BaseContactsProvider2Test { insertPhoneNumber(rawContactId, "800-466-4411"); CallerInfo callerInfo = CallerInfo.getCallerInfo(getProvider().getContext(), "18004664411"); - assertEquals("800-466-4411", callerInfo.phoneNumber); + assertEquals("800-466-4411", callerInfo.getPhoneNumber()); assertEquals("Home", callerInfo.phoneLabel); - assertEquals("Hot Tamale", callerInfo.name); + assertEquals("Hot Tamale", callerInfo.getName()); assertEquals("ring", String.valueOf(callerInfo.contactRingtoneUri)); assertEquals(true, callerInfo.shouldSendToVoicemail); assertEquals("content://com.android.contacts/phone_lookup_enterprise/18004664411", |