diff options
Diffstat (limited to 'tests')
4 files changed, 71 insertions, 19 deletions
diff --git a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java index 51d806d..9a881a8 100644 --- a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java @@ -16,7 +16,8 @@ package com.android.providers.contacts; -import com.google.android.collect.Maps; +import static com.android.providers.contacts.ContactsActor.PACKAGE_GREY; + import com.google.android.collect.Sets; import android.accounts.Account; @@ -26,7 +27,6 @@ import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.Entity; -import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; @@ -49,14 +49,10 @@ import android.provider.ContactsContract.RawContacts; import android.provider.ContactsContract.Settings; import android.provider.ContactsContract.StatusUpdates; import android.provider.ContactsContract.StreamItems; -import android.test.AndroidTestCase; import android.test.MoreAsserts; import android.test.mock.MockContentResolver; import android.util.Log; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -65,8 +61,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import static com.android.providers.contacts.ContactsActor.PACKAGE_GREY; - /** * A common superclass for {@link ContactsProvider2}-related tests. */ diff --git a/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java b/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java index 03a86c2..7aadca8 100644 --- a/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java +++ b/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java @@ -22,7 +22,6 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Binder; import android.test.mock.MockPackageManager; -import android.test.mock.MockResources; import java.util.HashMap; import java.util.List; @@ -92,11 +91,6 @@ public class ContactsMockPackageManager extends MockPackageManager { @Override public Resources getResourcesForApplication(String appPackageName) { - return new MockResources() { - @Override - public String getResourceName(int resid) throws NotFoundException { - return String.valueOf(resid); - } - }; + return new ContactsMockResources(); } } diff --git a/tests/src/com/android/providers/contacts/ContactsMockResources.java b/tests/src/com/android/providers/contacts/ContactsMockResources.java new file mode 100644 index 0000000..d1ec817 --- /dev/null +++ b/tests/src/com/android/providers/contacts/ContactsMockResources.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.providers.contacts; + +import com.google.common.collect.Maps; + +import android.content.res.Resources.NotFoundException; +import android.test.mock.MockResources; + +import java.util.Map; + +final class ContactsMockResources extends MockResources { + private Map<Integer, String> mPackages = Maps.newHashMap(); + private Map<Integer, String> mTypes = Maps.newHashMap(); + private Map<Integer, String> mEntries = Maps.newHashMap(); + + public void addResource(int resId, String packageName, String typeName, String entryName) { + mPackages.put(resId, packageName); + mTypes.put(resId, typeName); + mEntries.put(resId, entryName); + } + + @Override + public String getResourceName(int resId) throws NotFoundException { + if (!mPackages.containsKey(resId)) { + throw new NotFoundException("Resource " + resId + " not found"); + } + return mPackages.get(resId) + ":" + mTypes.get(resId) + "/" + mEntries.get(resId); + } + + @Override + public String getResourcePackageName(int resId) throws NotFoundException { + if (!mPackages.containsKey(resId)) { + throw new NotFoundException("Resource " + resId + " not found"); + } + return mPackages.get(resId); + } + + @Override + public String getResourceTypeName(int resId) throws NotFoundException { + if (!mPackages.containsKey(resId)) { + throw new NotFoundException("Resource " + resId + " not found"); + } + return mTypes.get(resId); + } + + @Override + public String getResourceEntryName(int resId) throws NotFoundException { + if (!mPackages.containsKey(resId)) { + throw new NotFoundException("Resource " + resId + " not found"); + } + return mEntries.get(resId); + } +}
\ No newline at end of file diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java index bf59ffd..973eb80 100644 --- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java @@ -520,8 +520,6 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test { Groups.SYSTEM_ID, Groups.DELETED, Groups.NOTES, - Groups.ACTION, - Groups.ACTION_URI, Groups.SHOULD_SYNC, Groups.FAVORITES, Groups.AUTO_ADD, @@ -550,8 +548,6 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test { Groups.SYSTEM_ID, Groups.DELETED, Groups.NOTES, - Groups.ACTION, - Groups.ACTION_URI, Groups.SHOULD_SYNC, Groups.FAVORITES, Groups.AUTO_ADD, |