diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-05 01:37:28 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-05 01:37:28 -0800 |
| commit | 15377bc11fc7b06b2bf9583a84af5aeee1fff4e8 (patch) | |
| tree | 36c36d01781e358cf23abf8711a06a173c51215e /tests/src | |
| parent | fae9f8ba8a4b5b69a4de4159a2e0379b0d1ddc32 (diff) | |
| parent | 02a534d13f5e04173efdf10a509de8aa85d2d6a5 (diff) | |
| download | latinime-15377bc11fc7b06b2bf9583a84af5aeee1fff4e8.tar.gz latinime-15377bc11fc7b06b2bf9583a84af5aeee1fff4e8.tar.xz latinime-15377bc11fc7b06b2bf9583a84af5aeee1fff4e8.zip | |
am 02a534d1: Merge "Treat a sole "|" as a special case of key label"
* commit '02a534d13f5e04173efdf10a509de8aa85d2d6a5':
Treat a sole "|" as a special case of key label
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java index a02d40299..cb640b3f8 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java @@ -101,7 +101,9 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { "a", null, ICON_UNDEFINED, 'a'); assertParser("Single surrogate", SURROGATE_PAIR1, SURROGATE_PAIR1, null, ICON_UNDEFINED, SURROGATE_CODE1); - assertParser("Single escaped bar", "\\|", + assertParser("Sole vertical bar", "|", + "|", null, ICON_UNDEFINED, '|'); + assertParser("Single escaped vertical bar", "\\|", "|", null, ICON_UNDEFINED, '|'); assertParser("Single escaped escape", "\\\\", "\\", null, ICON_UNDEFINED, '\\'); @@ -251,8 +253,6 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { } public void testFormatError() { - assertParserError("Single bar", "|", - "|", null, ICON_UNDEFINED, '|'); assertParserError("Empty label with outputText", "|a", null, "a", ICON_UNDEFINED, CODE_UNSPECIFIED); assertParserError("Empty label with code", "|" + CODE_SETTINGS, @@ -261,8 +261,6 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { "a", null, ICON_UNDEFINED, CODE_UNSPECIFIED); assertParserError("Empty outputText with icon", ICON_SETTINGS + "|", null, null, mSettingsIconId, CODE_UNSPECIFIED); - assertParserError("Empty icon and code", "|", - null, null, ICON_UNDEFINED, CODE_UNSPECIFIED); assertParserError("Icon without code", ICON_SETTINGS, null, null, mSettingsIconId, CODE_UNSPECIFIED); assertParserError("Non existing icon", ICON_NON_EXISTING + "|abc", |