Refactor vCard: clean up test code. (394026c5) · Commits · e / os / android_frameworks_base

core/java/android/pim/vcard/VCardComposer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -529,7 +529,7 @@ public class VCardComposer {
		final String selection = Data.CONTACT_ID + "=?";
		final String[] selectionArgs = new String[] {contactId};
		if (getEntityIteratorMethod != null) {
		// Please note that this branch is executed by some tests only
		// Please note that this branch is executed by unit tests only
		try {
		entityIterator = (EntityIterator)getEntityIteratorMethod.invoke(null,
		mContentResolver, uri, selection, selectionArgs, null);

core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java

+19 −19

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testNameShiftJis() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V30_JAPANESE_SJIS);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V30_JAPANESE_SJIS, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredName.CONTENT_ITEM_TYPE)
		.put(StructuredName.FAMILY_NAME, "\u3075\u308B\u3069")
		@@ -81,7 +81,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		* DoCoMo phones require all name elements should be in "family name" field.
		*/
		public void testNameDoCoMo() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredName.CONTENT_ITEM_TYPE)
		.put(StructuredName.FAMILY_NAME, "\u3075\u308B\u3069")
		@@ -106,8 +106,8 @@ public class VCardJapanizationTests extends VCardTestsBase {
		.addExpectedNode("X-DCM-HMN-MODE", "");
		}

		private void testPhoneticNameCommon(int vcardType) {
		mVerifier.initForExportTest(vcardType);
		private void testPhoneticNameCommon(int vcardType, String charset) {
		mVerifier.initForExportTest(vcardType, charset);
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredName.CONTENT_ITEM_TYPE)
		.put(StructuredName.PHONETIC_FAMILY_NAME, "\u3084\u307E\u3060")
		@@ -143,23 +143,23 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testPhoneticNameForJapaneseV21Utf8() {
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE);
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE, null);
		}

		public void testPhoneticNameForJapaneseV21Sjis() {
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE_SJIS);
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE_SJIS, "Shift_JIS");
		}

		public void testPhoneticNameForJapaneseV30Utf8() {
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V30_JAPANESE);
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V30_JAPANESE, null);
		}

		public void testPhoneticNameForJapaneseV30SJis() {
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V30_JAPANESE_SJIS);
		testPhoneticNameCommon(VCardConfig.VCARD_TYPE_V30_JAPANESE_SJIS, "Shift_JIS");
		}

		public void testPhoneticNameForMobileV21_1() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V21_JAPANESE_MOBILE);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V21_JAPANESE_MOBILE, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredName.CONTENT_ITEM_TYPE)
		.put(StructuredName.PHONETIC_FAMILY_NAME, "\u3084\u307E\u3060")
		@@ -183,7 +183,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testPhoneticNameForMobileV21_2() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V21_JAPANESE_MOBILE);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_V21_JAPANESE_MOBILE, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredName.CONTENT_ITEM_TYPE)
		.put(StructuredName.PHONETIC_FAMILY_NAME, "\u3084\u307E\u3060")
		@@ -199,8 +199,8 @@ public class VCardJapanizationTests extends VCardTestsBase {
		.put(StructuredName.DISPLAY_NAME, "\uFF94\uFF8F\uFF80\uFF9E \uFF80\uFF9B\uFF73");
		}

		private void testPostalAddressWithJapaneseCommon(int vcardType) {
		mVerifier.initForExportTest(vcardType);
		private void testPostalAddressWithJapaneseCommon(int vcardType, String charset) {
		mVerifier.initForExportTest(vcardType, charset);
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredPostal.CONTENT_ITEM_TYPE)
		.put(StructuredPostal.POBOX, "\u79C1\u66F8\u7BB107")
		@@ -241,7 +241,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		.put(StructuredPostal.TYPE, StructuredPostal.TYPE_HOME);
		}
		public void testPostalAddresswithJapaneseV21() {
		testPostalAddressWithJapaneseCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE_SJIS);
		testPostalAddressWithJapaneseCommon(VCardConfig.VCARD_TYPE_V21_JAPANESE_SJIS, "Shift_JIS");
		}

		/**
		@@ -249,7 +249,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		* Prefered type must (should?) be: HOME > WORK > OTHER > CUSTOM
		*/
		public void testPostalAdrressForDoCoMo_1() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredPostal.CONTENT_ITEM_TYPE)
		.put(StructuredPostal.TYPE, StructuredPostal.TYPE_WORK)
		@@ -277,7 +277,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testPostalAdrressForDoCoMo_2() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredPostal.CONTENT_ITEM_TYPE)
		.put(StructuredPostal.TYPE, StructuredPostal.TYPE_OTHER)
		@@ -302,7 +302,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testPostalAdrressForDoCoMo_3() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredPostal.CONTENT_ITEM_TYPE)
		.put(StructuredPostal.TYPE, StructuredPostal.TYPE_CUSTOM)
		@@ -330,7 +330,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		* Verifies the vCard exporter tolerates null TYPE.
		*/
		public void testPostalAdrressForDoCoMo_4() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(StructuredPostal.CONTENT_ITEM_TYPE)
		.put(StructuredPostal.POBOX, "1");
		@@ -380,7 +380,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testJapanesePhoneNumberDoCoMo() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(Phone.CONTENT_ITEM_TYPE)
		.put(Phone.NUMBER, "0312341234")
		@@ -400,7 +400,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
		}

		public void testNoteDoCoMo() {
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO);
		mVerifier.initForExportTest(VCardConfig.VCARD_TYPE_DOCOMO, "Shift_JIS");
		ContactEntry entry = mVerifier.addInputEntry();
		entry.addContentValues(Note.CONTENT_ITEM_TYPE)
		.put(Note.NOTE, "note1");

core/tests/coretests/src/android/pim/vcard/test_utils/ContactEntry.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,10 +22,12 @@ import java.util.ArrayList;
		import java.util.List;

		/**
		* Represents one contact, which should contain multiple ContentValues like
		* <p>
		* The class representing one contact, which should contain multiple ContentValues like
		* StructuredName, Email, etc.
		* </p>
		*/
		public class ContactEntry {
		public final class ContactEntry {
		private final List<ContentValues> mContentValuesList = new ArrayList<ContentValues>();

		public ContentValuesBuilder addContentValues(String mimeType) {

core/tests/coretests/src/android/pim/vcard/test_utils/ExportTestProvider.java

0 → 100644

+175 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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 android.pim.vcard.test_utils;

		import android.content.ContentResolver;
		import android.content.ContentValues;
		import android.content.Entity;
		import android.content.EntityIterator;
		import android.database.Cursor;
		import android.net.Uri;
		import android.pim.vcard.VCardComposer;
		import android.provider.ContactsContract.Contacts;
		import android.provider.ContactsContract.Data;
		import android.provider.ContactsContract.RawContacts;
		import android.test.mock.MockContentProvider;
		import android.test.mock.MockCursor;

		import junit.framework.TestCase;

		import java.util.ArrayList;
		import java.util.Iterator;
		import java.util.List;

		/* package */ class ExportTestProvider extends MockContentProvider {
		final private TestCase mTestCase;
		final private ArrayList<ContactEntry> mContactEntryList = new ArrayList<ContactEntry>();

		private static class MockEntityIterator implements EntityIterator {
		List<Entity> mEntityList;
		Iterator<Entity> mIterator;

		public MockEntityIterator(List<ContentValues> contentValuesList) {
		mEntityList = new ArrayList<Entity>();
		Entity entity = new Entity(new ContentValues());
		for (ContentValues contentValues : contentValuesList) {
		entity.addSubValue(Data.CONTENT_URI, contentValues);
		}
		mEntityList.add(entity);
		mIterator = mEntityList.iterator();
		}

		public boolean hasNext() {
		return mIterator.hasNext();
		}

		public Entity next() {
		return mIterator.next();
		}

		public void remove() {
		throw new UnsupportedOperationException("remove not supported");
		}

		public void reset() {
		mIterator = mEntityList.iterator();
		}

		public void close() {
		}
		}

		public ExportTestProvider(TestCase testCase) {
		mTestCase = testCase;
		}

		public ContactEntry buildInputEntry() {
		ContactEntry contactEntry = new ContactEntry();
		mContactEntryList.add(contactEntry);
		return contactEntry;
		}

		/**
		* <p>
		* An old method which had existed but was removed from ContentResolver.
		* </p>
		* <p>
		* We still keep using this method since we don't have a propeer way to know
		* which value in the ContentValue corresponds to the entry in Contacts database.
		* </p>
		*/
		public EntityIterator queryEntities(Uri uri,
		String selection, String[] selectionArgs, String sortOrder) {
		mTestCase.assertTrue(uri != null);
		mTestCase.assertTrue(ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()));
		final String authority = uri.getAuthority();
		mTestCase.assertTrue(RawContacts.CONTENT_URI.getAuthority().equals(authority));
		mTestCase.assertTrue((Data.CONTACT_ID + "=?").equals(selection));
		mTestCase.assertEquals(1, selectionArgs.length);
		final int id = Integer.parseInt(selectionArgs[0]);
		mTestCase.assertTrue(id >= 0 && id < mContactEntryList.size());

		return new MockEntityIterator(mContactEntryList.get(id).getList());
		}

		@Override
		public Cursor query(Uri uri,String[] projection,
		String selection, String[] selectionArgs, String sortOrder) {
		mTestCase.assertTrue(VCardComposer.CONTACTS_TEST_CONTENT_URI.equals(uri));
		// In this test, following arguments are not supported.
		mTestCase.assertNull(selection);
		mTestCase.assertNull(selectionArgs);
		mTestCase.assertNull(sortOrder);

		return new MockCursor() {
		int mCurrentPosition = -1;

		@Override
		public int getCount() {
		return mContactEntryList.size();
		}

		@Override
		public boolean moveToFirst() {
		mCurrentPosition = 0;
		return true;
		}

		@Override
		public boolean moveToNext() {
		if (mCurrentPosition < mContactEntryList.size()) {
		mCurrentPosition++;
		return true;
		} else {
		return false;
		}
		}

		@Override
		public boolean isBeforeFirst() {
		return mCurrentPosition < 0;
		}

		@Override
		public boolean isAfterLast() {
		return mCurrentPosition >= mContactEntryList.size();
		}

		@Override
		public int getColumnIndex(String columnName) {
		mTestCase.assertEquals(Contacts._ID, columnName);
		return 0;
		}

		@Override
		public int getInt(int columnIndex) {
		mTestCase.assertEquals(0, columnIndex);
		mTestCase.assertTrue(mCurrentPosition >= 0
		&& mCurrentPosition < mContactEntryList.size());
		return mCurrentPosition;
		}

		@Override
		public String getString(int columnIndex) {
		return String.valueOf(getInt(columnIndex));
		}

		@Override
		public void close() {
		}
		};
		}
		}
		No newline at end of file

core/tests/coretests/src/android/pim/vcard/test_utils/ExportTestResolver.java

+2 −167

Original line number	Diff line number	Diff line
		@@ -15,29 +15,14 @@
		*/
		package android.pim.vcard.test_utils;

		import android.content.ContentResolver;

		import android.content.ContentValues;
		import android.content.Entity;
		import android.content.EntityIterator;
		import android.database.Cursor;
		import android.net.Uri;
		import android.pim.vcard.VCardComposer;
		import android.provider.ContactsContract.Contacts;
		import android.provider.ContactsContract.Data;
		import android.provider.ContactsContract.RawContacts;
		import android.test.mock.MockContentProvider;
		import android.test.mock.MockContentResolver;
		import android.test.mock.MockCursor;

		import junit.framework.TestCase;

		import java.util.ArrayList;
		import java.util.Iterator;
		import java.util.List;

		public class ExportTestResolver extends MockContentResolver {
		ExportTestProvider mProvider;
		/* package */ class ExportTestResolver extends MockContentResolver {
		private final ExportTestProvider mProvider;
		public ExportTestResolver(TestCase testCase) {
		mProvider = new ExportTestProvider(testCase);
		addProvider(VCardComposer.VCARD_TEST_AUTHORITY, mProvider);
		@@ -52,153 +37,3 @@ public class ExportTestResolver extends MockContentResolver {
		return mProvider;
		}
		}

		/* package */ class ExportTestProvider extends MockContentProvider {
		final private TestCase mTestCase;
		final private ArrayList<ContactEntry> mContactEntryList = new ArrayList<ContactEntry>();

		private static class MockEntityIterator implements EntityIterator {
		List<Entity> mEntityList;
		Iterator<Entity> mIterator;

		public MockEntityIterator(List<ContentValues> contentValuesList) {
		mEntityList = new ArrayList<Entity>();
		Entity entity = new Entity(new ContentValues());
		for (ContentValues contentValues : contentValuesList) {
		entity.addSubValue(Data.CONTENT_URI, contentValues);
		}
		mEntityList.add(entity);
		mIterator = mEntityList.iterator();
		}

		public boolean hasNext() {
		return mIterator.hasNext();
		}

		public Entity next() {
		return mIterator.next();
		}

		public void remove() {
		throw new UnsupportedOperationException("remove not supported");
		}

		public void reset() {
		mIterator = mEntityList.iterator();
		}

		public void close() {
		}
		}

		public ExportTestProvider(TestCase testCase) {
		mTestCase = testCase;
		}

		public ContactEntry buildInputEntry() {
		ContactEntry contactEntry = new ContactEntry();
		mContactEntryList.add(contactEntry);
		return contactEntry;
		}

		/**
		* <p>
		* An old method which had existed but was removed from ContentResolver.
		* </p>
		* <p>
		* We still keep using this method since we don't have a propeer way to know
		* which value in the ContentValue corresponds to the entry in Contacts database.
		* </p>
		* <p>
		* Detail:
		* There's an easy way to know which index "family name" corresponds to, via
		* {@link android.provider.ContactsContract}.
		* FAMILY_NAME equals DATA3, so the corresponding index
		* for "family name" should be 2 (note that index is 0-origin).
		* However, we cannot know what the index 2 corresponds to; it may be "family name",
		* "label" for now, but may be the other some column in the future. We don't have
		* convenient way to know the original data structure.
		* </p>
		*/
		public EntityIterator queryEntities(Uri uri,
		String selection, String[] selectionArgs, String sortOrder) {
		mTestCase.assertTrue(uri != null);
		mTestCase.assertTrue(ContentResolver.SCHEME_CONTENT.equals(uri.getScheme()));
		final String authority = uri.getAuthority();
		mTestCase.assertTrue(RawContacts.CONTENT_URI.getAuthority().equals(authority));
		mTestCase.assertTrue((Data.CONTACT_ID + "=?").equals(selection));
		mTestCase.assertEquals(1, selectionArgs.length);
		final int id = Integer.parseInt(selectionArgs[0]);
		mTestCase.assertTrue(id >= 0 && id < mContactEntryList.size());

		return new MockEntityIterator(mContactEntryList.get(id).getList());
		}

		@Override
		public Cursor query(Uri uri,String[] projection,
		String selection, String[] selectionArgs, String sortOrder) {
		mTestCase.assertTrue(VCardComposer.CONTACTS_TEST_CONTENT_URI.equals(uri));
		// In this test, following arguments are not supported.
		mTestCase.assertNull(selection);
		mTestCase.assertNull(selectionArgs);
		mTestCase.assertNull(sortOrder);

		return new MockCursor() {
		int mCurrentPosition = -1;

		@Override
		public int getCount() {
		return mContactEntryList.size();
		}

		@Override
		public boolean moveToFirst() {
		mCurrentPosition = 0;
		return true;
		}

		@Override
		public boolean moveToNext() {
		if (mCurrentPosition < mContactEntryList.size()) {
		mCurrentPosition++;
		return true;
		} else {
		return false;
		}
		}

		@Override
		public boolean isBeforeFirst() {
		return mCurrentPosition < 0;
		}

		@Override
		public boolean isAfterLast() {
		return mCurrentPosition >= mContactEntryList.size();
		}

		@Override
		public int getColumnIndex(String columnName) {
		mTestCase.assertEquals(Contacts._ID, columnName);
		return 0;
		}

		@Override
		public int getInt(int columnIndex) {
		mTestCase.assertEquals(0, columnIndex);
		mTestCase.assertTrue(mCurrentPosition >= 0
		&& mCurrentPosition < mContactEntryList.size());
		return mCurrentPosition;
		}

		@Override
		public String getString(int columnIndex) {
		return String.valueOf(getInt(columnIndex));
		}

		@Override
		public void close() {
		}
		};
		}
		}