aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2016-02-10 17:50:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-10 17:50:10 +0000
commit69a3ec5c23d2f60fc911408c865e9664d540590e (patch)
treebac7261f0e51a4ad688200bd0484ee0ea0b54e90 /tests
parentb2609837fb18f8b4871ce76d81aab2806b1d8074 (diff)
parentb59df4c3c9562db5873c461b45786345e1af9dbe (diff)
downloadContactsProvider-69a3ec5c23d2f60fc911408c865e9664d540590e.tar.gz
Merge "Fix CP2 unit tests" into nyc-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/contacts/ContactsProvider2Test.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 0d063e8f..e6b8b86f 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -2923,8 +2923,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
}
public void testUpdateMetadataOnRawContactInsert() throws Exception {
- ContactMetadataProvider contactMetadataProvider = (ContactMetadataProvider) addProvider(
- ContactMetadataProvider.class, MetadataSync.METADATA_AUTHORITY);
+ ContactMetadataProvider contactMetadataProvider = addProvider(
+ ContactMetadataProviderTestable.class, MetadataSync.METADATA_AUTHORITY);
// Reset the dbHelper to be the one ContactsProvider2 is using. Before this, two providers
// are using different dbHelpers.
contactMetadataProvider.setDatabaseHelper(((SynchronousContactsProvider2)
@@ -2979,8 +2979,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
}
public void testUpdateMetadataOnRawContactBackupIdChange() throws Exception {
- ContactMetadataProvider contactMetadataProvider = (ContactMetadataProvider) addProvider(
- ContactMetadataProvider.class, MetadataSync.METADATA_AUTHORITY);
+ ContactMetadataProvider contactMetadataProvider = addProvider(
+ ContactMetadataProviderTestable.class, MetadataSync.METADATA_AUTHORITY);
// Reset the dbHelper to be the one ContactsProvider2 is using. Before this, two providers
// are using different dbHelpers.
contactMetadataProvider.setDatabaseHelper(((SynchronousContactsProvider2)
@@ -3045,8 +3045,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
}
public void testDeleteMetadataOnRawContactDelete() throws Exception {
- ContactMetadataProvider contactMetadataProvider = (ContactMetadataProvider) addProvider(
- ContactMetadataProvider.class, MetadataSync.METADATA_AUTHORITY);
+ ContactMetadataProvider contactMetadataProvider = addProvider(
+ ContactMetadataProviderTestable.class, MetadataSync.METADATA_AUTHORITY);
// Reset the dbHelper to be the one ContactsProvider2 is using. Before this, two providers
// are using different dbHelpers.
contactMetadataProvider.setDatabaseHelper(((SynchronousContactsProvider2)
@@ -6654,8 +6654,8 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
mActor.setAccounts(new Account[]{doomedAccount, safeAccount});
cp.onAccountsUpdated(new Account[]{doomedAccount, safeAccount});
- ContactMetadataProvider contactMetadataProvider = (ContactMetadataProvider) addProvider(
- ContactMetadataProvider.class, MetadataSync.METADATA_AUTHORITY);
+ ContactMetadataProvider contactMetadataProvider = addProvider(
+ ContactMetadataProviderTestable.class, MetadataSync.METADATA_AUTHORITY);
// Reset the dbHelper to be the one ContactsProvider2 is using. Before this, two providers
// are using different dbHelpers.
contactMetadataProvider.setDatabaseHelper(((SynchronousContactsProvider2)