aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-10 12:54:45 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-02-10 14:38:53 +0900
commitbd9887a57485c602e66a8f0eaebe40313ffa89cd (patch)
tree15e999d9c370257fbd13c8e640aa0437d93b09ce /tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
parente592c1b291b9eba807b0ee888a3944555d296877 (diff)
downloadlatinime-bd9887a57485c602e66a8f0eaebe40313ffa89cd.tar.gz
latinime-bd9887a57485c602e66a8f0eaebe40313ffa89cd.tar.xz
latinime-bd9887a57485c602e66a8f0eaebe40313ffa89cd.zip
Fix possible NPE while finding device override value from resource
Bug: 12949735 Change-Id: Iffda08db413b3b3d338ab9bf625bb0968c2e48dd
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java')
-rw-r--r--tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java33
1 files changed, 0 insertions, 33 deletions
diff --git a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
index 1ae22e307..3eb704093 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
@@ -19,43 +19,10 @@ package com.android.inputmethod.latin.utils;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.inputmethod.latin.utils.ResourceUtils.DeviceOverridePatternSyntaxError;
-
import java.util.HashMap;
@SmallTest
public class ResourceUtilsTests extends AndroidTestCase {
- public void testFindDefaultConstant() {
- final String[] nullArray = null;
- final String[] emptyArray = {};
- final String[] array = {
- "HARDWARE=grouper,0.3",
- "HARDWARE=mako,0.4",
- ",defaultValue1",
- "HARDWARE=manta,0.2",
- ",defaultValue2",
- };
-
- try {
- assertNull(ResourceUtils.findDefaultConstant(nullArray));
- assertNull(ResourceUtils.findDefaultConstant(emptyArray));
- assertEquals(ResourceUtils.findDefaultConstant(array), "defaultValue1");
- } catch (final DeviceOverridePatternSyntaxError e) {
- fail(e.getMessage());
- }
-
- final String[] errorArray = {
- "HARDWARE=grouper,0.3",
- "no_comma"
- };
- try {
- final String defaultValue = ResourceUtils.findDefaultConstant(errorArray);
- fail("exception should be thrown: defaultValue=" + defaultValue);
- } catch (final DeviceOverridePatternSyntaxError e) {
- assertEquals("Array element has no comma: no_comma", e.getMessage());
- }
- }
-
public void testFindConstantForKeyValuePairsSimple() {
final HashMap<String,String> anyKeyValue = CollectionUtils.newHashMap();
anyKeyValue.put("anyKey", "anyValue");