diff options
Diffstat (limited to 'tests/src/com/android/contacts/activities/SimImportActivityTest.java')
| -rw-r--r-- | tests/src/com/android/contacts/activities/SimImportActivityTest.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java index 7069ef18f..250ce4b6c 100644 --- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java +++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java @@ -40,6 +40,8 @@ import android.os.Build; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; +import android.provider.SimPhonebookContract; +import android.provider.SimPhonebookContract.SimRecords; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; @@ -48,9 +50,9 @@ import android.test.mock.MockContentResolver; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.filters.SdkSuppress; -import androidx.test.runner.AndroidJUnit4; import com.android.contacts.SimImportService; import com.android.contacts.database.SimContactDao; @@ -224,10 +226,10 @@ public class SimImportActivityTest { final AccountWithDataSet targetAccount = mAccountHelper.addTestAccount( mAccountHelper.generateAccountName("SimImportActivity0_targetAccount_")); - final MockContentProvider iccProvider = new MockContentProvider(); - iccProvider.expect(MockContentProvider.Query.forAnyUri()) - .withDefaultProjection(new String[] {SimContactDaoImpl._ID, SimContactDaoImpl.NAME, - SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS }) + final MockContentProvider simPhonebookProvider = new MockContentProvider(); + simPhonebookProvider.expect(MockContentProvider.Query.forAnyUri()) + .withProjection( + SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER) .anyNumberOfTimes() .returnRow(toCursorRow(new SimContact(1, "Import One", "5550101"))) .returnRow(toCursorRow(new SimContact(2, "Skip Two", "5550102"))) @@ -236,7 +238,7 @@ public class SimImportActivityTest { .returnRow(toCursorRow(new SimContact(5, "Skip Five", "5550105"))) .returnRow(toCursorRow(new SimContact(6, "Import Six", "5550106"))); final MockContentResolver mockResolver = new MockContentResolver(); - mockResolver.addProvider("icc", iccProvider); + mockResolver.addProvider(SimPhonebookContract.AUTHORITY, simPhonebookProvider); final ContentProviderClient contactsProviderClient = mContext.getContentResolver() .acquireContentProviderClient(ContactsContract.AUTHORITY); mockResolver.addProvider(ContactsContract.AUTHORITY, new ForwardingContentProvider( @@ -258,6 +260,7 @@ public class SimImportActivityTest { mActivity = mInstrumentation.startActivitySync( new Intent(mContext, SimImportActivity.class) + .putExtra(SimImportActivity.EXTRA_SUBSCRIPTION_ID, 1) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); assertTrue(mDevice.wait(Until.hasObject(By.desc("Show more")), TIMEOUT)); @@ -319,6 +322,7 @@ public class SimImportActivityTest { mActivity = mInstrumentation.startActivitySync( new Intent(mContext, SimImportActivity.class) + .putExtra(SimImportActivity.EXTRA_SUBSCRIPTION_ID, 1) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); assertTrue(mDevice.wait(Until.hasObject(By.text("Import One")), TIMEOUT)); @@ -351,7 +355,7 @@ public class SimImportActivityTest { } private Object[] toCursorRow(SimContact contact) { - return new Object[] { contact.getId(), contact.getName(), contact.getPhone(), null }; + return new Object[]{contact.getRecordNumber(), contact.getName(), contact.getPhone()}; } private SimCard someSimCard() { |