Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make vCard code a separated static library."

Browse Source
This commit is contained in:
Daisuke Miyakawa
2010-05-20 11:30:26 -07:00
committed by Android (Google) Code Review
parent 3ec26bdef9 64545a8ced
commit 422017be68
67 changed files with 256 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/pim/vcard/exception/package.html
View File

@@ -1,5 +0,0 @@
<HTML>
<BODY>
{@hide}
</BODY>
</HTML>

5
core/java/android/pim/vcard/package.html
View File

@@ -1,5 +0,0 @@
<HTML>
<BODY>
{@hide}
</BODY>
</HTML>

28
vcard/Android.mk Normal file
View File

@@ -0,0 +1,28 @@
# 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := com.android.vcard
LOCAL_SRC_FILES := $(call all-java-files-under, java)
# Use google-common instead of android-common for using hidden code in telephony library.
# Use ext for using Quoted-Printable codec.
LOCAL_JAVA_LIBRARIES := google-common ext
include $(BUILD_STATIC_JAVA_LIBRARY)
# Build the test package.
include $(call all-makefiles-under, $(LOCAL_PATH))

2
core/java/android/pim/vcard/JapaneseUtils.java → vcard/java/com/android/vcard/JapaneseUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import java.util.HashMap;
import java.util.Map;

8
core/java/android/pim/vcard/VCardBuilder.java → vcard/java/com/android/vcard/VCardBuilder.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.content.ContentValues;
import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -30,11 +30,10 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Base64;
import android.util.CharsetUtils;
import android.util.Log;
import org.apache.commons.codec.binary.Base64;
import java.io.UnsupportedEncodingException;
import java.nio.charset.UnsupportedCharsetException;
import java.util.ArrayList;
@@ -1166,7 +1165,8 @@ public class VCardBuilder {
Log.d(LOG_TAG, "Unknown photo type. Ignored.");
continue;
}
final String photoString = new String(Base64.encodeBase64(data));
// TODO: check this works fine.
final String photoString = new String(Base64.encode(data, Base64.NO_WRAP));
if (!TextUtils.isEmpty(photoString)) {
appendPhotoLine(photoString, photoType);
}

6
core/java/android/pim/vcard/VCardComposer.java → vcard/java/com/android/vcard/VCardComposer.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -24,7 +24,6 @@ import android.content.Entity.NamedContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
import android.net.Uri;
import android.pim.vcard.exception.VCardException;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.RawContacts;
@@ -45,6 +44,8 @@ import android.text.TextUtils;
import android.util.CharsetUtils;
import android.util.Log;
import com.android.vcard.exception.VCardException;
import java.io.BufferedWriter;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -526,6 +527,7 @@ public class VCardComposer {
EntityIterator entityIterator = null;
try {
final Uri uri = RawContactsEntity.CONTENT_URI.buildUpon()
// .appendQueryParameter("for_export_only", "1")
.appendQueryParameter(Data.FOR_EXPORT_ONLY, "1")
.build();
final String selection = Data.CONTACT_ID + "=?";

5
core/java/android/pim/vcard/VCardConfig.java → vcard/java/com/android/vcard/VCardConfig.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.telephony.PhoneNumberUtils;
import android.util.Log;
@@ -53,7 +53,6 @@ public class VCardConfig {
* and it has 1 to 1 mapping in all 8bit characters.
* If the assumption is not correct, this setting will cause some bug.
* </p>
* @hide made public just for unit test
*/
public static final String DEFAULT_INTERMEDIATE_CHARSET = "ISO-8859-1";
@@ -476,4 +475,4 @@ public class VCardConfig {
private VCardConfig() {
}
}
}

2
core/java/android/pim/vcard/VCardConstants.java → vcard/java/com/android/vcard/VCardConstants.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
/**
* Constants used in both exporter and importer code.

4
core/java/android/pim/vcard/VCardEntry.java → vcard/java/com/android/vcard/VCardEntry.java
View File

@@ -13,20 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.accounts.Account;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentResolver;
import android.content.OperationApplicationException;
import android.database.Cursor;
import android.net.Uri;
import android.os.RemoteException;
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Groups;
import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;

2
core/java/android/pim/vcard/VCardEntryCommitter.java → vcard/java/com/android/vcard/VCardEntryCommitter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.content.ContentResolver;
import android.net.Uri;

12
core/java/android/pim/vcard/VCardEntryConstructor.java → vcard/java/com/android/vcard/VCardEntryConstructor.java
View File

@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.accounts.Account;
import android.text.TextUtils;
import android.util.Base64;
import android.util.CharsetUtils;
import android.util.Log;
import org.apache.commons.codec.binary.Base64;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -190,9 +189,14 @@ public class VCardEntryConstructor implements VCardInterpreter {
private String handleOneValue(String value,
String sourceCharset, String targetCharset, String encoding) {
if (value == null) {
Log.w(LOG_TAG, "Null is given.");
value = "";
}
if (encoding != null) {
if (encoding.equals("BASE64") || encoding.equals("B")) {
mCurrentProperty.setPropertyBytes(Base64.decodeBase64(value.getBytes()));
mCurrentProperty.setPropertyBytes(Base64.decode(value.getBytes(), Base64.DEFAULT));
return value;
} else if (encoding.equals("QUOTED-PRINTABLE")) {
return VCardUtils.parseQuotedPrintable(

2
core/java/android/pim/vcard/VCardEntryCounter.java → vcard/java/com/android/vcard/VCardEntryCounter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import java.util.List;

2
core/java/android/pim/vcard/VCardEntryHandler.java → vcard/java/com/android/vcard/VCardEntryHandler.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
/**
* <p>

2
core/java/android/pim/vcard/VCardInterpreter.java → vcard/java/com/android/vcard/VCardInterpreter.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import java.util.List;

2
core/java/android/pim/vcard/VCardInterpreterCollection.java → vcard/java/com/android/vcard/VCardInterpreterCollection.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import java.util.Collection;
import java.util.List;

4
core/java/android/pim/vcard/VCardParser.java → vcard/java/com/android/vcard/VCardParser.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.pim.vcard.exception.VCardException;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;

15
core/java/android/pim/vcard/VCardParserImpl_V21.java → vcard/java/com/android/vcard/VCardParserImpl_V21.java
View File

@@ -13,17 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.pim.vcard.exception.VCardAgentNotSupportedException;
import android.pim.vcard.exception.VCardException;
import android.pim.vcard.exception.VCardInvalidCommentLineException;
import android.pim.vcard.exception.VCardInvalidLineException;
import android.pim.vcard.exception.VCardNestedException;
import android.pim.vcard.exception.VCardVersionException;
import android.text.TextUtils;
import android.util.Log;
import com.android.vcard.exception.VCardAgentNotSupportedException;
import com.android.vcard.exception.VCardException;
import com.android.vcard.exception.VCardInvalidCommentLineException;
import com.android.vcard.exception.VCardInvalidLineException;
import com.android.vcard.exception.VCardNestedException;
import com.android.vcard.exception.VCardVersionException;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;

9
core/java/android/pim/vcard/VCardParserImpl_V30.java → vcard/java/com/android/vcard/VCardParserImpl_V30.java
View File

@@ -13,14 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.util.Log;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.util.Set;
import android.pim.vcard.exception.VCardException;
import android.util.Log;
/**
* <p>
* Basic implementation achieving vCard 3.0 parsing.

4
core/java/android/pim/vcard/VCardParser_V21.java → vcard/java/com/android/vcard/VCardParser_V21.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.pim.vcard.exception.VCardException;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;

4
core/java/android/pim/vcard/VCardParser_V30.java → vcard/java/com/android/vcard/VCardParser_V30.java
View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.pim.vcard.exception.VCardException;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;

2
core/java/android/pim/vcard/VCardSourceDetector.java → vcard/java/com/android/vcard/VCardSourceDetector.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import android.text.TextUtils;

41
core/java/android/pim/vcard/VCardUtils.java → vcard/java/com/android/vcard/VCardUtils.java
View File

@@ -13,7 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.net.QuotedPrintableCodec;
import android.content.ContentProviderOperation;
import android.provider.ContactsContract.Data;
@@ -24,9 +27,6 @@ import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.net.QuotedPrintableCodec;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,7 +39,6 @@ import java.util.Set;
/**
* Utilities for VCard handling codes.
* @hide
*/
public class VCardUtils {
private static final String LOG_TAG = "VCardUtils";
@@ -193,8 +192,7 @@ public class VCardUtils {
// For backward compatibility.
// Detail: Until Donut, there isn't TYPE_MOBILE for email while there is now.
// To support mobile type at that time, this custom label had been used.
return (android.provider.Contacts.ContactMethodsColumns.MOBILE_EMAIL_TYPE_NAME.equals(label)
|| sMobilePhoneLabelSet.contains(label));
return ("_AUTO_CELL".equals(label) || sMobilePhoneLabelSet.contains(label));
}
public static boolean isValidInV21ButUnknownToContactsPhoteType(final String label) {
@@ -625,26 +623,33 @@ public class VCardUtils {
}
builder.append(line);
}
byte[] bytes;
try {
bytes = builder.toString().getBytes(sourceCharset);
} catch (UnsupportedEncodingException e1) {
Log.e(LOG_TAG, "Failed to encode: charset=" + targetCharset);
bytes = builder.toString().getBytes();
final String rawString = builder.toString();
if (TextUtils.isEmpty(rawString)) {
Log.w(LOG_TAG, "Given raw string is empty.");
}
byte[] rawBytes = null;
try {
bytes = QuotedPrintableCodec.decodeQuotedPrintable(bytes);
rawBytes = rawString.getBytes(sourceCharset);
} catch (UnsupportedEncodingException e) {
Log.w(LOG_TAG, "Failed to decode: " + sourceCharset);
rawBytes = rawString.getBytes();
}
byte[] decodedBytes = null;
try {
decodedBytes = QuotedPrintableCodec.decodeQuotedPrintable(rawBytes);
} catch (DecoderException e) {
Log.e(LOG_TAG, "Failed to decode quoted-printable: " + e);
return "";
Log.e(LOG_TAG, "DecoderException is thrown.");
decodedBytes = rawBytes;
}
try {
return new String(bytes, targetCharset);
return new String(decodedBytes, targetCharset);
} catch (UnsupportedEncodingException e) {
Log.e(LOG_TAG, "Failed to encode: charset=" + targetCharset);
return new String(bytes);
return new String(decodedBytes);
}
}

2
core/java/android/pim/vcard/exception/VCardAgentNotSupportedException.java → vcard/java/com/android/vcard/exception/VCardAgentNotSupportedException.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
public class VCardAgentNotSupportedException extends VCardNotSupportedException {
public VCardAgentNotSupportedException() {

2
core/java/android/pim/vcard/exception/VCardException.java → vcard/java/com/android/vcard/exception/VCardException.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
public class VCardException extends java.lang.Exception {
/**

2
core/java/android/pim/vcard/exception/VCardInvalidCommentLineException.java → vcard/java/com/android/vcard/exception/VCardInvalidCommentLineException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
/**
* Thrown when the vCard has some line starting with '#'. In the specification,

3
core/java/android/pim/vcard/exception/VCardInvalidLineException.java → vcard/java/com/android/vcard/exception/VCardInvalidLineException.java
View File

@@ -13,8 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
/**
* Thrown when the vCard has some line starting with '#'. In the specification,

2
core/java/android/pim/vcard/exception/VCardNestedException.java → vcard/java/com/android/vcard/exception/VCardNestedException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
/**
* VCardException thrown when VCard is nested without VCardParser's being notified.

2
core/java/android/pim/vcard/exception/VCardNotSupportedException.java → vcard/java/com/android/vcard/exception/VCardNotSupportedException.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
/**
* The exception which tells that the input VCard is probably valid from the view of

3
core/java/android/pim/vcard/exception/VCardVersionException.java → vcard/java/com/android/vcard/exception/VCardVersionException.java
View File

@@ -13,8 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.exception;
package com.android.vcard.exception;
/**
* VCardException used only when the version of the vCard is different.

25
vcard/tests/Android.mk Normal file
View File

@@ -0,0 +1,25 @@
# 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.
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := AndroidVCardTests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.runner google-common
LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard
include $(BUILD_PACKAGE)

30
vcard/tests/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.vcard.tests"
android:sharedUserId="com.android.uid.test">
<application>
<uses-library android:name="android.test.runner" />
</application>
<!-- Run tests with "runtest common" -->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.vcard.tests"
android:label="Android vCard Library Tests" />
</manifest>

0
core/tests/coretests/res/raw/v21_backslash.vcf → vcard/tests/res/raw/v21_backslash.vcf
View File

0
core/tests/coretests/res/raw/v21_complicated.vcf → vcard/tests/res/raw/v21_complicated.vcf
View File

0
core/tests/coretests/res/raw/v21_invalid_comment_line.vcf → vcard/tests/res/raw/v21_invalid_comment_line.vcf
View File

0
core/tests/coretests/res/raw/v21_japanese_1.vcf → vcard/tests/res/raw/v21_japanese_1.vcf
View File

0
core/tests/coretests/res/raw/v21_japanese_2.vcf → vcard/tests/res/raw/v21_japanese_2.vcf
View File

0
core/tests/coretests/res/raw/v21_multiple_entry.vcf → vcard/tests/res/raw/v21_multiple_entry.vcf
View File

0
core/tests/coretests/res/raw/v21_org_before_title.vcf → vcard/tests/res/raw/v21_org_before_title.vcf
View File

0
core/tests/coretests/res/raw/v21_pref_handling.vcf → vcard/tests/res/raw/v21_pref_handling.vcf
View File

0
core/tests/coretests/res/raw/v21_simple_1.vcf → vcard/tests/res/raw/v21_simple_1.vcf
View File

0
core/tests/coretests/res/raw/v21_simple_2.vcf → vcard/tests/res/raw/v21_simple_2.vcf
View File

0
core/tests/coretests/res/raw/v21_simple_3.vcf → vcard/tests/res/raw/v21_simple_3.vcf
View File

0
core/tests/coretests/res/raw/v21_title_before_org.vcf → vcard/tests/res/raw/v21_title_before_org.vcf
View File

0
core/tests/coretests/res/raw/v21_winmo_65.vcf → vcard/tests/res/raw/v21_winmo_65.vcf
View File

0
core/tests/coretests/res/raw/v30_comma_separated.vcf → vcard/tests/res/raw/v30_comma_separated.vcf
View File

0
core/tests/coretests/res/raw/v30_simple.vcf → vcard/tests/res/raw/v30_simple.vcf
View File

10
core/tests/coretests/src/android/pim/vcard/VCardExporterTests.java → vcard/tests/src/com/android/vcard/tests/VCardExporterTests.java
View File

@@ -14,12 +14,9 @@
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard.tests;
import android.content.ContentValues;
import android.pim.vcard.test_utils.ContactEntry;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.Im;
@@ -33,6 +30,11 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import com.android.vcard.VCardConfig;
import com.android.vcard.tests.test_utils.ContactEntry;
import com.android.vcard.tests.test_utils.PropertyNodesVerifierElem;
import com.android.vcard.tests.test_utils.PropertyNodesVerifierElem.TypeSet;
import java.util.Arrays;
/**

10
core/tests/coretests/src/android/pim/vcard/VCardImporterTests.java → vcard/tests/src/com/android/vcard/tests/VCardImporterTests.java
View File

@@ -13,12 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard.tests;
import android.content.ContentValues;
import android.pim.vcard.test_utils.ContentValuesVerifier;
import android.pim.vcard.test_utils.ContentValuesVerifierElem;
import android.pim.vcard.test_utils.PropertyNodesVerifierElem.TypeSet;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Event;
@@ -30,7 +27,10 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import com.android.frameworks.coretests.R;
import com.android.vcard.VCardConfig;
import com.android.vcard.tests.test_utils.ContentValuesVerifier;
import com.android.vcard.tests.test_utils.ContentValuesVerifierElem;
import com.android.vcard.tests.test_utils.PropertyNodesVerifierElem.TypeSet;
import java.util.Arrays;

13
core/tests/coretests/src/android/pim/vcard/VCardJapanizationTests.java → vcard/tests/src/com/android/vcard/tests/VCardJapanizationTests.java
View File

@@ -13,20 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard.tests;
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.provider.ContactsContract.CommonDataKinds.Nickname;
import android.provider.ContactsContract.CommonDataKinds.Note;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import com.android.vcard.VCardConfig;
import com.android.vcard.tests.test_utils.ContactEntry;
import com.android.vcard.tests.test_utils.ContentValuesBuilder;
import com.android.vcard.tests.test_utils.PropertyNodesVerifierElem;
import com.android.vcard.tests.test_utils.PropertyNodesVerifierElem.TypeSet;
import java.util.Arrays;
public class VCardJapanizationTests extends VCardTestsBase {

7
core/tests/coretests/src/android/pim/vcard/VCardTestsBase.java → vcard/tests/src/com/android/vcard/tests/VCardTestsBase.java
View File

@@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard;
package com.android.vcard.tests;
import android.content.ContentValues;
import android.pim.vcard.test_utils.VCardVerifier;
import android.test.AndroidTestCase;
import com.android.vcard.VCardConfig;
import com.android.vcard.tests.test_utils.VCardVerifier;
/**
* BaseClass for vCard unit tests with utility classes.
* Please do not add each unit test here.

5
core/tests/coretests/src/android/pim/vcard/VCardUtilsTests.java → vcard/tests/src/com/android/vcard/tests/VCardUtilsTests.java
View File

@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.vcard.tests;
package android.pim.vcard;
import android.pim.vcard.VCardUtils;
import com.android.vcard.VCardUtils;
import junit.framework.TestCase;

2
core/tests/coretests/src/android/pim/vcard/test_utils/ContactEntry.java → vcard/tests/src/com/android/vcard/tests/test_utils/ContactEntry.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;
import android.provider.ContactsContract.Data;

2
core/tests/coretests/src/android/pim/vcard/test_utils/ContentValuesBuilder.java → vcard/tests/src/com/android/vcard/tests/test_utils/ContentValuesBuilder.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;

19
core/tests/coretests/src/android/pim/vcard/test_utils/ContentValuesVerifier.java → vcard/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifier.java
View File

@@ -13,18 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardEntry;
import android.pim.vcard.VCardEntryConstructor;
import android.pim.vcard.VCardEntryHandler;
import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.VCardParser_V30;
import android.pim.vcard.exception.VCardException;
import android.test.AndroidTestCase;
import com.android.vcard.VCardConfig;
import com.android.vcard.VCardEntry;
import com.android.vcard.VCardEntryConstructor;
import com.android.vcard.VCardEntryHandler;
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;

21
core/tests/coretests/src/android/pim/vcard/test_utils/ContentValuesVerifierElem.java → vcard/tests/src/com/android/vcard/tests/test_utils/ContentValuesVerifierElem.java
View File

@@ -13,21 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardEntry;
import android.pim.vcard.VCardEntryCommitter;
import android.pim.vcard.VCardEntryConstructor;
import android.pim.vcard.VCardEntryHandler;
import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.VCardParser_V30;
import android.pim.vcard.exception.VCardException;
import android.provider.ContactsContract.Data;
import android.test.AndroidTestCase;
import com.android.vcard.VCardConfig;
import com.android.vcard.VCardEntry;
import com.android.vcard.VCardEntryCommitter;
import com.android.vcard.VCardEntryConstructor;
import com.android.vcard.VCardEntryHandler;
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;

5
core/tests/coretests/src/android/pim/vcard/test_utils/ExportTestProvider.java → vcard/tests/src/com/android/vcard/tests/test_utils/ExportTestProvider.java
View File

@@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -21,13 +21,14 @@ 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 com.android.vcard.VCardComposer;
import junit.framework.TestCase;
import java.util.ArrayList;

5
core/tests/coretests/src/android/pim/vcard/test_utils/ExportTestResolver.java → vcard/tests/src/com/android/vcard/tests/test_utils/ExportTestResolver.java
View File

@@ -13,12 +13,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.pim.vcard.VCardComposer;
import android.provider.ContactsContract.RawContacts;
import android.test.mock.MockContentResolver;
import com.android.vcard.VCardComposer;
import junit.framework.TestCase;
/* package */ class ExportTestResolver extends MockContentResolver {

10
core/tests/coretests/src/android/pim/vcard/test_utils/ImportTestProvider.java → vcard/tests/src/com/android/vcard/tests/test_utils/ImportTestProvider.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
@@ -36,6 +36,7 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
import android.provider.ContactsContract.CommonDataKinds.Website;
import android.test.mock.MockContentProvider;
import android.text.TextUtils;
import android.util.Log;
import junit.framework.TestCase;
@@ -257,10 +258,15 @@ import java.util.Map.Entry;
if (value instanceof byte[]) {
Object actualValue = actual.get(key);
if (!Arrays.equals((byte[])value, (byte[])actualValue)) {
byte[] e = (byte[])value;
byte[] a = (byte[])actualValue;
Log.d("@@@", "expected (len: " + e.length + "): " + Arrays.toString(e));
Log.d("@@@", "actual (len: " + a.length + "): " + Arrays.toString(a));
return false;
}
} else if (!value.equals(actual.get(key))) {
return false;
Log.d("@@@", "different.");
return false;
}
}
return true;

2
core/tests/coretests/src/android/pim/vcard/test_utils/ImportTestResolver.java → vcard/tests/src/com/android/vcard/tests/test_utils/ImportTestResolver.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;

5
core/tests/coretests/src/android/pim/vcard/test_utils/LineVerifier.java → vcard/tests/src/com/android/vcard/tests/test_utils/LineVerifier.java
View File

@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import com.android.vcard.VCardComposer;
import android.content.Context;
import android.pim.vcard.VCardComposer;
import junit.framework.TestCase;

5
core/tests/coretests/src/android/pim/vcard/test_utils/LineVerifierElem.java → vcard/tests/src/com/android/vcard/tests/test_utils/LineVerifierElem.java
View File

@@ -13,11 +13,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.pim.vcard.VCardConfig;
import android.text.TextUtils;
import com.android.vcard.VCardConfig;
import junit.framework.TestCase;
import java.util.ArrayList;

5
core/tests/coretests/src/android/pim/vcard/test_utils/PropertyNode.java → vcard/tests/src/com/android/vcard/tests/test_utils/PropertyNode.java
View File

@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;
import android.pim.vcard.VCardEntry;
import com.android.vcard.VCardEntry;
import java.util.ArrayList;
import java.util.Arrays;

13
core/tests/coretests/src/android/pim/vcard/test_utils/PropertyNodesVerifier.java → vcard/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifier.java
View File

@@ -13,15 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.VCardParser_V30;
import android.pim.vcard.exception.VCardException;
import android.test.AndroidTestCase;
import com.android.vcard.VCardConfig;
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.exception.VCardException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;

2
core/tests/coretests/src/android/pim/vcard/test_utils/PropertyNodesVerifierElem.java → vcard/tests/src/com/android/vcard/tests/test_utils/PropertyNodesVerifierElem.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;

21
core/tests/coretests/src/android/pim/vcard/test_utils/VCardVerifier.java → vcard/tests/src/com/android/vcard/tests/test_utils/VCardVerifier.java
View File

@@ -13,26 +13,27 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentResolver;
import android.content.Context;
import android.content.EntityIterator;
import android.net.Uri;
import android.pim.vcard.VCardComposer;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardEntryConstructor;
import android.pim.vcard.VCardInterpreter;
import android.pim.vcard.VCardInterpreterCollection;
import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.VCardParser_V30;
import android.pim.vcard.exception.VCardException;
import android.test.AndroidTestCase;
import android.test.mock.MockContext;
import android.text.TextUtils;
import android.util.Log;
import com.android.vcard.VCardComposer;
import com.android.vcard.VCardConfig;
import com.android.vcard.VCardEntryConstructor;
import com.android.vcard.VCardInterpreter;
import com.android.vcard.VCardInterpreterCollection;
import com.android.vcard.VCardParser;
import com.android.vcard.VCardParser_V21;
import com.android.vcard.VCardParser_V30;
import com.android.vcard.exception.VCardException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;

2
core/tests/coretests/src/android/pim/vcard/test_utils/VNode.java → vcard/tests/src/com/android/vcard/tests/test_utils/VNode.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import java.util.ArrayList;

13
core/tests/coretests/src/android/pim/vcard/test_utils/VNodeBuilder.java → vcard/tests/src/com/android/vcard/tests/test_utils/VNodeBuilder.java
View File

@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.pim.vcard.test_utils;
package com.android.vcard.tests.test_utils;
import android.content.ContentValues;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardInterpreter;
import android.pim.vcard.VCardUtils;
import android.util.Base64;
import android.util.CharsetUtils;
import android.util.Log;
import org.apache.commons.codec.binary.Base64;
import com.android.vcard.VCardConfig;
import com.android.vcard.VCardInterpreter;
import com.android.vcard.VCardUtils;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
@@ -185,8 +185,7 @@ import java.util.List;
encoding = encoding.toUpperCase();
if (encoding.equals("BASE64") || encoding.equals("B")) {
// Assume BASE64 is used only when the number of values is 1.
mCurrentPropNode.propValue_bytes =
Base64.decodeBase64(value.getBytes());
mCurrentPropNode.propValue_bytes = Base64.decode(value.getBytes(), Base64.NO_WRAP);
return value;
} else if (encoding.equals("QUOTED-PRINTABLE")) {
return VCardUtils.parseQuotedPrintable(