diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java | 32 |
2 files changed, 20 insertions, 16 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java index 093f75247..a117a5a65 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java @@ -379,9 +379,9 @@ public class KeySpecParserCsvTests extends AndroidTestCase { "!fixedColumnOrder!2", "!hasLabels!", "AM", "PM"); assertTextArray("Settings as more key", "!label/settings_as_more_key", - "!icon/settingsKey|!code/key_settings"); + "!icon/settings_key|!code/key_settings"); assertTextArray("SETTINGS AS MORE KEY", "!LABEL/SETTINGS_AS_MORE_KEY", - "!icon/settingsKey|!code/key_settings"); + "!icon/settings_key|!code/key_settings"); assertTextArray("Indirect naviagte actions as more key", "!label/indirect_navigate_actions_as_more_key", diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java index 79d8d849e..429557da9 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java @@ -22,6 +22,7 @@ import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UN import android.test.AndroidTestCase; +import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.internal.KeySpecParser.MoreKeySpec; import java.util.Arrays; @@ -31,11 +32,8 @@ public class KeySpecParserTests extends AndroidTestCase { private final KeyboardCodesSet mCodesSet = new KeyboardCodesSet(); private final KeyboardLabelsSet mLabelsSet = new KeyboardLabelsSet(); - private static final String CODE_SETTINGS_NAME = "key_settings"; - private static final String ICON_SETTINGS_NAME = "settingsKey"; - - private static final String CODE_SETTINGS = "!code/" + CODE_SETTINGS_NAME; - private static final String ICON_SETTINGS = "!icon/" + ICON_SETTINGS_NAME; + private static final String CODE_SETTINGS = "!code/key_settings"; + private static final String ICON_SETTINGS = "!icon/settings_key"; private static final String CODE_SETTINGS_UPPERCASE = CODE_SETTINGS.toUpperCase(); private static final String ICON_SETTINGS_UPPERCASE = ICON_SETTINGS.toUpperCase(); private static final String CODE_NON_EXISTING = "!code/non_existing"; @@ -54,19 +52,25 @@ public class KeySpecParserTests extends AndroidTestCase { mLabelsSet.setLanguage(language); mLabelsSet.loadStringResources(getContext()); - mCodeSettings = mCodesSet.getCode(CODE_SETTINGS_NAME); - mCodeActionNext = mCodesSet.getCode("key_action_next"); - mSettingsIconId = KeyboardIconsSet.getIconId(ICON_SETTINGS_NAME); + mCodeSettings = KeySpecParser.parseCode( + CODE_SETTINGS, mCodesSet, CODE_UNSPECIFIED); + mCodeActionNext = KeySpecParser.parseCode( + "!code/key_action_next", mCodesSet, CODE_UNSPECIFIED); + mSettingsIconId = KeySpecParser.getIconId(ICON_SETTINGS); } private void assertParser(String message, String moreKeySpec, String expectedLabel, String expectedOutputText, int expectedIcon, int expectedCode) { - final MoreKeySpec spec = new MoreKeySpec( - KeySpecParser.resolveLabelReference(moreKeySpec, mLabelsSet), mCodesSet); - assertEquals(message + ": label:", expectedLabel, spec.mLabel); - assertEquals(message + ": ouptputText:", expectedOutputText, spec.mOutputText); - assertEquals(message + ": icon:", expectedIcon, spec.mIconId); - assertEquals(message + ": codes value:", expectedCode, spec.mCode); + final String labelResolved = KeySpecParser.resolveLabelReference(moreKeySpec, mLabelsSet); + final MoreKeySpec spec = new MoreKeySpec(labelResolved, mCodesSet); + assertEquals(message + " [label]", expectedLabel, spec.mLabel); + assertEquals(message + " [ouptputText]", expectedOutputText, spec.mOutputText); + assertEquals(message + " [icon]", + KeyboardIconsSet.getIconName(expectedIcon), + KeyboardIconsSet.getIconName(spec.mIconId)); + assertEquals(message + " [code]", + Keyboard.printableCode(expectedCode), + Keyboard.printableCode(spec.mCode)); } private void assertParserError(String message, String moreKeySpec, String expectedLabel, |