diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:20:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:20:52 +0000 |
commit | 1b2ea53753310bc8c3b9e44404f9643aa69fae51 (patch) | |
tree | 2187ce93796dc544f0887e18216f259afccb24a4 | |
parent | c9ca9d68a39f6c38b832f240518da5d4864cf2cd (diff) | |
parent | 3989155acecdec9a0e68a14a17b898d0e006f608 (diff) | |
download | vcard-android13-qpr3-release.tar.gz |
Snap for 9470583 from 3989155acecdec9a0e68a14a17b898d0e006f608 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release
Change-Id: I900eddedfd74254ffc9a9a536331d97fec762286
11 files changed, 290 insertions, 1 deletions
@@ -27,4 +27,8 @@ java_library { "//apex_available:platform", "com.android.bluetooth", ], + + libs: [ + "framework-annotations-lib", + ] } diff --git a/java/com/android/vcard/JapaneseUtils.java b/java/com/android/vcard/JapaneseUtils.java index 5b44944..7079648 100644 --- a/java/com/android/vcard/JapaneseUtils.java +++ b/java/com/android/vcard/JapaneseUtils.java @@ -16,6 +16,8 @@ package com.android.vcard; +import com.android.internal.annotations.VisibleForTesting; + import java.util.HashMap; import java.util.Map; @@ -23,7 +25,8 @@ import java.util.Map; * TextUtils especially for Japanese. */ /* package */ class JapaneseUtils { - static private final Map<Character, String> sHalfWidthMap = + @VisibleForTesting + static final Map<Character, String> sHalfWidthMap = new HashMap<Character, String>(); static { diff --git a/tests/Android.bp b/tests/Android.bp index 5c49410..ec1d932 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -31,6 +31,10 @@ android_test { static_libs: [ "com.android.vcard", "junit", + "androidx.test.ext.truth", + "androidx.test.rules", + "mockito-target", + "truth-prebuilt", ], jacoco: { diff --git a/tests/src/com/android/vcard/tests/JapaneseUtilsTest.java b/tests/src/com/android/vcard/tests/JapaneseUtilsTest.java new file mode 100644 index 0000000..452944e --- /dev/null +++ b/tests/src/com/android/vcard/tests/JapaneseUtilsTest.java @@ -0,0 +1,31 @@ +/* + * Copyright 2022 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.vcard; + +import com.android.vcard.JapaneseUtils; + +import junit.framework.TestCase; + +public class JapaneseUtilsTest extends TestCase { + static final char TEST_CONTAINED_CHAR = '\uFFE5'; + static final char TEST_UNCONTAINED_CHAR = '\uFFF5'; + + public void testTryGetHalfWidthText() { + assertNull(JapaneseUtils.tryGetHalfWidthText(TEST_UNCONTAINED_CHAR)); + assertEquals(JapaneseUtils.tryGetHalfWidthText(TEST_CONTAINED_CHAR), "\u005C\u005C"); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardAgentNotSupportedExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardAgentNotSupportedExceptionTest.java new file mode 100644 index 0000000..c370ec0 --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardAgentNotSupportedExceptionTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardAgentNotSupportedException; + +import junit.framework.TestCase; + +public class VCardAgentNotSupportedExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardAgentNotSupportedException exception = new VCardAgentNotSupportedException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardAgentNotSupportedException exception = new VCardAgentNotSupportedException( + TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardExceptionTest.java new file mode 100644 index 0000000..6f09fad --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardExceptionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardException; + +import junit.framework.TestCase; + +public class VCardExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardException exception = new VCardException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardException exception = new VCardException(TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardInvalidCommentLineExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardInvalidCommentLineExceptionTest.java new file mode 100644 index 0000000..5a1429f --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardInvalidCommentLineExceptionTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardInvalidCommentLineException; + +import junit.framework.TestCase; + +public class VCardInvalidCommentLineExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardInvalidCommentLineException exception = new VCardInvalidCommentLineException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardInvalidCommentLineException exception = new VCardInvalidCommentLineException( + TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardInvalidLineExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardInvalidLineExceptionTest.java new file mode 100644 index 0000000..6568de8 --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardInvalidLineExceptionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardInvalidLineException; + +import junit.framework.TestCase; + +public class VCardInvalidLineExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardInvalidLineException exception = new VCardInvalidLineException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardInvalidLineException exception = new VCardInvalidLineException(TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardNestedExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardNestedExceptionTest.java new file mode 100644 index 0000000..ee87dc2 --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardNestedExceptionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardNestedException; + +import junit.framework.TestCase; + +public class VCardNestedExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardNestedException exception = new VCardNestedException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardNestedException exception = new VCardNestedException(TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardNotSupportedExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardNotSupportedExceptionTest.java new file mode 100644 index 0000000..0d393be --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardNotSupportedExceptionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardNotSupportedException; + +import junit.framework.TestCase; + +public class VCardNotSupportedExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardNotSupportedException exception = new VCardNotSupportedException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardNotSupportedException exception = new VCardNotSupportedException(TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} diff --git a/tests/src/com/android/vcard/tests/exception/VCardVersionExceptionTest.java b/tests/src/com/android/vcard/tests/exception/VCardVersionExceptionTest.java new file mode 100644 index 0000000..1e9ed67 --- /dev/null +++ b/tests/src/com/android/vcard/tests/exception/VCardVersionExceptionTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2022 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.vcard.tests; + +import com.android.vcard.exception.VCardVersionException; + +import junit.framework.TestCase; + +public class VCardVersionExceptionTest extends TestCase { + static final String TEST_MESSAGE = "message"; + + public void testExceptionWithoutMessage() { + VCardVersionException exception = new VCardVersionException(); + assertNull(exception.getMessage()); + } + + public void testExceptionWithMessage() { + VCardVersionException exception = new VCardVersionException(TEST_MESSAGE); + assertEquals(exception.getMessage(), TEST_MESSAGE); + } +} |