diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-02 13:37:46 -0700 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-02 13:42:22 -0700 |
| commit | 3bd9b8f04cece37ab4405abc382e2810006b9f97 (patch) | |
| tree | 1b60ec45c947560a9794e51f051e07a49583bdcf /core | |
| parent | b1f5a54a2abd95d03dc96f5f691495d2d7dfadc7 (diff) | |
| download | frameworks_base-3bd9b8f04cece37ab4405abc382e2810006b9f97.zip frameworks_base-3bd9b8f04cece37ab4405abc382e2810006b9f97.tar.gz frameworks_base-3bd9b8f04cece37ab4405abc382e2810006b9f97.tar.bz2 | |
Fix build breakage.
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
Diffstat (limited to 'core')
8 files changed, 35 insertions, 4 deletions
diff --git a/core/tests/coretests/res/raw/v21_im.vcf b/core/tests/coretests/res/raw/v21_im.vcf new file mode 100644 index 0000000..cc1aabb --- /dev/null +++ b/core/tests/coretests/res/raw/v21_im.vcf @@ -0,0 +1,5 @@ +BEGIN:VCARD +VERSION:2.1 +X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nick;1;;;;;;;;;;;;; +X-GOOGLE-TALK:hhh@gmail.com +END:VCARD diff --git a/core/tests/coretests/res/raw/v21_invalid_multiple_line.vcf b/core/tests/coretests/res/raw/v21_invalid_multiple_line.vcf new file mode 100644 index 0000000..9c81fd5 --- /dev/null +++ b/core/tests/coretests/res/raw/v21_invalid_multiple_line.vcf @@ -0,0 +1,7 @@ +BEGIN:VCARD +VERSION:2.1 +N:;Omega;;; +EMAIL;INTERNET:"Omega" + <omega@example.com> +FN:Omega +END:VCARD diff --git a/core/tests/coretests/res/raw/v30_comma_separated.vcf b/core/tests/coretests/res/raw/v30_comma_separated.vcf index 98a7f20..f1baf88 100644 --- a/core/tests/coretests/res/raw/v30_comma_separated.vcf +++ b/core/tests/coretests/res/raw/v30_comma_separated.vcf @@ -1,5 +1,5 @@ BEGIN:VCARD
VERSION:3.0
-N:F;G;M;;
-TEL;TYPE=PAGER,WORK,MSG:6101231234@pagersample.com
+N;TYPE=PREF,HOME:F;G;M;;
+TEL;TYPE="COMMA,SEPARATED:INSIDE.DQUOTE",PREF:1
END:VCARD
diff --git a/core/tests/coretests/res/raw/v30_pager.vcf b/core/tests/coretests/res/raw/v30_pager.vcf new file mode 100644 index 0000000..98a7f20 --- /dev/null +++ b/core/tests/coretests/res/raw/v30_pager.vcf @@ -0,0 +1,5 @@ +BEGIN:VCARD
+VERSION:3.0
+N:F;G;M;;
+TEL;TYPE=PAGER,WORK,MSG:6101231234@pagersample.com
+END:VCARD
diff --git a/core/tests/coretests/res/raw/v40_sort_as.vcf b/core/tests/coretests/res/raw/v40_sort_as.vcf new file mode 100644 index 0000000..6f6bc3b --- /dev/null +++ b/core/tests/coretests/res/raw/v40_sort_as.vcf @@ -0,0 +1,6 @@ +BEGIN:VCARD
+VERSION:4.0
+FN:安藤 ロイド
+N;SORT-AS="あんどう;ろいど":安藤;ロイド;;;
+ORG;TYPE=WORK;SORT-AS="ぐーぐる;けんさくぶもん":グーグル;検索部門
+END:VCARD
diff --git a/core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java b/core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java index 04d3888..09e2914 100644 --- a/core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java +++ b/core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java @@ -15,10 +15,13 @@ */ package android.pim.vcard; -import com.android.internal.R; +import com.android.frameworks.coretests.R; import android.content.ContentValues; import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet; +import android.pim.vcard.test_utils.VCardTestsBase; +import android.pim.vcard.test_utils.ContentValuesVerifier; +import android.pim.vcard.test_utils.ContentValuesVerifierElem; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Im; diff --git a/core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java b/core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java index 8ff7597..8a99419 100644 --- a/core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java +++ b/core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java @@ -16,7 +16,11 @@ package android.pim.vcard; import android.content.ContentValues; +import android.pim.vcard.test_utils.ContactEntry; +import android.pim.vcard.test_utils.ContentValuesBuilder; +import android.pim.vcard.test_utils.PropertyNodesVerifierElem; import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet; +import android.pim.vcard.test_utils.VCardTestsBase; import android.provider.ContactsContract.CommonDataKinds.Nickname; import android.provider.ContactsContract.CommonDataKinds.Note; import android.provider.ContactsContract.CommonDataKinds.Phone; diff --git a/core/tests/coretests/src/android/pim/vcard/VCardTestUtilsTests.java b/core/tests/coretests/src/android/pim/vcard/VCardTestUtilsTests.java index 8375ff7..3ff5cf7 100644 --- a/core/tests/coretests/src/android/pim/vcard/VCardTestUtilsTests.java +++ b/core/tests/coretests/src/android/pim/vcard/VCardTestUtilsTests.java @@ -15,8 +15,9 @@ */ package android.pim.vcard; -import com.android.internal.R; +import com.android.frameworks.coretests.R; +import android.pim.vcard.test_utils.VCardVerifier; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.test.AndroidTestCase; |