diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-05 01:37:26 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-05 01:37:26 -0800 |
| commit | fae9f8ba8a4b5b69a4de4159a2e0379b0d1ddc32 (patch) | |
| tree | 5f3f94a20331d88cf665d3408aa0193f27213068 /tests/src | |
| parent | 66cd9da5d33445678a1da4f8a90569695e7d0176 (diff) | |
| parent | 6e5dbdd5013258a33a3a9a3da0f0b74d3d9ed289 (diff) | |
| download | latinime-fae9f8ba8a4b5b69a4de4159a2e0379b0d1ddc32.tar.gz latinime-fae9f8ba8a4b5b69a4de4159a2e0379b0d1ddc32.tar.xz latinime-fae9f8ba8a4b5b69a4de4159a2e0379b0d1ddc32.zip | |
am 6e5dbdd5: Merge "Add null check to KeySpecParser"
* commit '6e5dbdd5013258a33a3a9a3da0f0b74d3d9ed289':
Add null check to KeySpecParser
Diffstat (limited to 'tests/src')
3 files changed, 23 insertions, 4 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java index 9b6c46200..9e43bd4d2 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java @@ -16,6 +16,9 @@ package com.android.inputmethod.keyboard.internal; +import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED; +import static com.android.inputmethod.latin.Constants.CODE_UNSPECIFIED; + import android.test.suitebuilder.annotation.SmallTest; import com.android.inputmethod.latin.Constants; @@ -40,4 +43,13 @@ public final class KeySpecParserTests extends KeySpecParserTestsBase { Constants.printableCode(expectedCode), Constants.printableCode(actualCode)); } + + // TODO: Remove this method. + // These should throw {@link KeySpecParserError} when Key.keyLabel attribute become mandatory. + public void testEmptySpec() { + assertParser("Null spec", null, + null, null, ICON_UNDEFINED, CODE_UNSPECIFIED); + assertParser("Empty spec", "", + null, null, ICON_UNDEFINED, CODE_UNSPECIFIED); + } } diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java index 04b7008ef..a02d40299 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java @@ -251,10 +251,6 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { } public void testFormatError() { - assertParserError("Null spec", null, null, - null, ICON_UNDEFINED, CODE_UNSPECIFIED); - assertParserError("Empty spec", "", null, - null, ICON_UNDEFINED, CODE_UNSPECIFIED); assertParserError("Single bar", "|", "|", null, ICON_UNDEFINED, '|'); assertParserError("Empty label with outputText", "|a", diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java index e49c62461..ea25bcf37 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java @@ -16,6 +16,9 @@ package com.android.inputmethod.keyboard.internal; +import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED; +import static com.android.inputmethod.latin.Constants.CODE_UNSPECIFIED; + import android.test.suitebuilder.annotation.SmallTest; import com.android.inputmethod.latin.Constants; @@ -42,6 +45,14 @@ public final class MoreKeySpecTests extends KeySpecParserTestsBase { Constants.printableCode(spec.mCode)); } + // TODO: Move this method to {@link KeySpecParserBase}. + public void testEmptySpec() { + assertParserError("Null spec", null, + null, null, ICON_UNDEFINED, CODE_UNSPECIFIED); + assertParserError("Empty spec", "", + null, null, ICON_UNDEFINED, CODE_UNSPECIFIED); + } + private static void assertArrayEquals(final String message, final Object[] expected, final Object[] actual) { if (expected == actual) { |