diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-01-31 19:18:15 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-02-05 17:49:26 +0900 |
| commit | d9c6b332090c90e4d4840e62fe3eb45c834b2e14 (patch) | |
| tree | aeec13a3b8cfa8d8d8fe1fe4628f503bb6a1320e /tests/src | |
| parent | bc9514032abe85ff6c18d2af5802ad0ee11a2241 (diff) | |
| download | latinime-d9c6b332090c90e4d4840e62fe3eb45c834b2e14.tar.gz latinime-d9c6b332090c90e4d4840e62fe3eb45c834b2e14.tar.xz latinime-d9c6b332090c90e4d4840e62fe3eb45c834b2e14.zip | |
Add null check to KeySpecParser
Change-Id: Ic37db8cbf8f83f753d7381e1edba8eac1ef1ceb1
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) { |