diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-11-19 11:19:25 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-11-19 11:21:39 +0900 |
| commit | a6d81e3ee4cf12ade1ef6701b5f1fcdd390fc98a (patch) | |
| tree | a94f4b51301fca3e002b9fbab6e304bfa9db2d26 /tests/AndroidTests/src/com/android | |
| parent | ddd017f872bee40450c0e73dcf6608a9fdc49a05 (diff) | |
| download | frameworks_base-a6d81e3ee4cf12ade1ef6701b5f1fcdd390fc98a.zip frameworks_base-a6d81e3ee4cf12ade1ef6701b5f1fcdd390fc98a.tar.gz frameworks_base-a6d81e3ee4cf12ade1ef6701b5f1fcdd390fc98a.tar.bz2 | |
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Internal issue number: 2195990
Diffstat (limited to 'tests/AndroidTests/src/com/android')
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java | 3 | ||||
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java | 18 |
2 files changed, 18 insertions, 3 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java index eeb7cc4..d891497 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java +++ b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java @@ -18,7 +18,6 @@ package com.android.unit_tests.vcard; import android.content.ContentValues; import android.pim.vcard.VCardConfig; -import android.pim.vcard.VCardParser; import android.pim.vcard.VCardParser_V21; import android.pim.vcard.exception.VCardException; import android.provider.ContactsContract.Data; @@ -869,7 +868,7 @@ public class VCardImporterTests extends VCardTestsBase { elem.addExpected(StructuredPostal.CONTENT_ITEM_TYPE) .put(StructuredPostal.POSTCODE, "150-8512") - .put(StructuredPostal.NEIGHBORHOOD, + .put(StructuredPostal.STREET, "\u6771\u4EAC\u90FD\u6E0B\u8C37\u533A\u685C" + "\u4E18\u753A\u0032\u0036\u002D\u0031\u30BB" + "\u30EB\u30EA\u30A2\u30F3\u30BF\u30EF\u30FC" + diff --git a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java index dd20ec6..a54c958 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java +++ b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java @@ -211,7 +211,7 @@ public class VCardJapanizationTests extends VCardTestsBase { entry.buildData(StructuredPostal.CONTENT_ITEM_TYPE) .put(StructuredPostal.POBOX, "\u79C1\u66F8\u7BB107") .put(StructuredPostal.NEIGHBORHOOD, - "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4") + "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4") .put(StructuredPostal.STREET, "\u96DB\u898B\u6CA2\u6751") .put(StructuredPostal.CITY, "\u9E7F\u9AA8\u5E02") .put(StructuredPostal.REGION, "\u00D7\u00D7\u770C") @@ -237,6 +237,22 @@ public class VCardJapanizationTests extends VCardTestsBase { "\u96DB\u898B\u6CA2\u6751", "\u9E7F\u9AA8\u5E02", "\u00D7\u00D7\u770C", "494-1313", "\u65E5\u672C"), contentValues); + // NEIGHBORHOOD is "not" used. Instead, "Extended address" is appended into the + // other field with a space. + verifier.addImportVerifier().addExpected(StructuredPostal.CONTENT_ITEM_TYPE) + .put(StructuredPostal.POBOX, "\u79C1\u66F8\u7BB107") + .put(StructuredPostal.STREET, "\u96DB\u898B\u6CA2\u6751 " + + "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4") + .put(StructuredPostal.CITY, "\u9E7F\u9AA8\u5E02") + .put(StructuredPostal.REGION, "\u00D7\u00D7\u770C") + .put(StructuredPostal.POSTCODE, "494-1313") + .put(StructuredPostal.COUNTRY, "\u65E5\u672C") + .put(StructuredPostal.FORMATTED_ADDRESS, + "\u65E5\u672C 494-1313 \u00D7\u00D7\u770C \u9E7F\u9AA8\u5E02 " + + "\u96DB\u898B\u6CA2\u6751 " + + "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4 " + + "\u79C1\u66F8\u7BB107") + .put(StructuredPostal.TYPE, StructuredPostal.TYPE_HOME); verifier.verify(); } |