aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/internal/PopupCharactersParserTests.java281
1 files changed, 146 insertions, 135 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/PopupCharactersParserTests.java b/tests/src/com/android/inputmethod/keyboard/internal/PopupCharactersParserTests.java
index be64f89d2..e4a1c68d8 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/PopupCharactersParserTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/internal/PopupCharactersParserTests.java
@@ -16,23 +16,24 @@
package com.android.inputmethod.keyboard.internal;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.internal.PopupCharactersParser.PopupCharactersParserError;
-import com.android.inputmethod.latin.R;
import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
import android.test.AndroidTestCase;
+import com.android.inputmethod.keyboard.Keyboard;
+import com.android.inputmethod.latin.R;
+
public class PopupCharactersParserTests extends AndroidTestCase {
private Resources mRes;
+ private static final int ICON_SETTINGS_KEY = 5;
+ private static final int ICON_UNDEFINED = KeyboardIconsSet.ICON_UNDEFINED;
+
private static final String CODE_SETTINGS = "@integer/key_settings";
- private static final String ICON_SETTINGS = "@drawable/sym_keyboard_settings";
+ private static final String ICON_SETTINGS = "@icon/" + ICON_SETTINGS_KEY;
private static final String CODE_NON_EXISTING = "@integer/non_existing";
- private static final String ICON_NON_EXISTING = "@drawable/non_existing";
+ private static final String ICON_NON_EXISTING = "@icon/non_existing";
private int mCodeSettings;
- private Drawable mIconSettings;
@Override
protected void setUp() {
@@ -41,33 +42,26 @@ public class PopupCharactersParserTests extends AndroidTestCase {
final String packageName = res.getResourcePackageName(R.string.english_ime_name);
final int codeId = res.getIdentifier(CODE_SETTINGS.substring(1), null, packageName);
- final int iconId = res.getIdentifier(ICON_SETTINGS.substring(1), null, packageName);
mCodeSettings = res.getInteger(codeId);
- mIconSettings = res.getDrawable(iconId);
}
private void assertParser(String message, String popupSpec, String expectedLabel,
- String expectedOutputText, Drawable expectedIcon, int expectedCode) {
+ String expectedOutputText, int expectedIcon, int expectedCode) {
String actualLabel = PopupCharactersParser.getLabel(popupSpec);
assertEquals(message + ": label:", expectedLabel, actualLabel);
String actualOutputText = PopupCharactersParser.getOutputText(popupSpec);
assertEquals(message + ": ouptputText:", expectedOutputText, actualOutputText);
- Drawable actualIcon = PopupCharactersParser.getIcon(mRes, popupSpec);
- // We can not compare drawables, checking null or non-null instead.
- if (expectedIcon == null) {
- assertNull(message + ": icon null:", actualIcon);
- } else {
- assertNotNull(message + ": icon non-null:", actualIcon);
- }
+ int actualIcon = PopupCharactersParser.getIconId(popupSpec);
+ assertEquals(message + ": icon:", expectedIcon, actualIcon);
int actualCode = PopupCharactersParser.getCode(mRes, popupSpec);
assertEquals(message + ": codes value:", expectedCode, actualCode);
}
private void assertParserError(String message, String popupSpec, String expectedLabel,
- String expectedOutputText, Drawable expectedIcon, int expectedCode) {
+ String expectedOutputText, int expectedIcon, int expectedCode) {
try {
assertParser(message, popupSpec, expectedLabel, expectedOutputText, expectedIcon,
expectedCode);
@@ -78,132 +72,149 @@ public class PopupCharactersParserTests extends AndroidTestCase {
}
public void testSingleLetter() {
- assertParser("Single letter", "a", "a", null, null, 'a');
- assertParser("Single escaped bar", "\\|", "|", null, null, '|');
- assertParser("Single escaped escape", "\\\\", "\\", null, null, '\\');
- assertParser("Single comma", ",", ",", null, null, ',');
- assertParser("Single escaped comma", "\\,", ",", null, null, ',');
- assertParser("Single escaped letter", "\\a", "a", null, null, 'a');
- assertParser("Single at", "@", "@", null, null, '@');
- assertParser("Single escaped at", "\\@", "@", null, null, '@');
- assertParser("Single letter with outputText", "a|abc", "a", "abc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with escaped outputText", "a|a\\|c", "a", "a|c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with comma outputText", "a|a,b", "a", "a,b", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with escaped comma outputText", "a|a\\,b", "a", "a,b", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with outputText starts with at", "a|@bc", "a", "@bc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with outputText contains at", "a|a@c", "a", "a@c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with escaped at outputText", "a|\\@bc", "a", "@bc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single escaped escape with outputText", "\\\\|\\\\", "\\", "\\", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single escaped bar with outputText", "\\||\\|", "|", "|", null,
- Keyboard.CODE_DUMMY);
- assertParser("Single letter with code", "a|" + CODE_SETTINGS, "a", null, null,
- mCodeSettings);
+ assertParser("Single letter", "a",
+ "a", null, ICON_UNDEFINED, 'a');
+ assertParser("Single escaped bar", "\\|",
+ "|", null, ICON_UNDEFINED, '|');
+ assertParser("Single escaped escape", "\\\\",
+ "\\", null, ICON_UNDEFINED, '\\');
+ assertParser("Single comma", ",",
+ ",", null, ICON_UNDEFINED, ',');
+ assertParser("Single escaped comma", "\\,",
+ ",", null, ICON_UNDEFINED, ',');
+ assertParser("Single escaped letter", "\\a",
+ "a", null, ICON_UNDEFINED, 'a');
+ assertParser("Single at", "@",
+ "@", null, ICON_UNDEFINED, '@');
+ assertParser("Single escaped at", "\\@",
+ "@", null, ICON_UNDEFINED, '@');
+ assertParser("Single letter with outputText", "a|abc",
+ "a", "abc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with escaped outputText", "a|a\\|c",
+ "a", "a|c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with comma outputText", "a|a,b",
+ "a", "a,b", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with escaped comma outputText", "a|a\\,b",
+ "a", "a,b", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with outputText starts with at", "a|@bc",
+ "a", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with outputText contains at", "a|a@c",
+ "a", "a@c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with escaped at outputText", "a|\\@bc",
+ "a", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single escaped escape with outputText", "\\\\|\\\\",
+ "\\", "\\", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single escaped bar with outputText", "\\||\\|",
+ "|", "|", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Single letter with code", "a|" + CODE_SETTINGS,
+ "a", null, ICON_UNDEFINED, mCodeSettings);
}
public void testLabel() {
- assertParser("Simple label", "abc", "abc", "abc", null, Keyboard.CODE_DUMMY);
- assertParser("Label with escaped bar", "a\\|c", "a|c", "a|c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped escape", "a\\\\c", "a\\c", "a\\c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with comma", "a,c", "a,c", "a,c", null, Keyboard.CODE_DUMMY);
- assertParser("Label with escaped comma", "a\\,c", "a,c", "a,c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label starts with at", "@bc", "@bc", "@bc", null, Keyboard.CODE_DUMMY);
- assertParser("Label contains at", "a@c", "a@c", "a@c", null, Keyboard.CODE_DUMMY);
- assertParser("Label with escaped at", "\\@bc", "@bc", "@bc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped letter", "\\abc", "abc", "abc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with outputText", "abc|def", "abc", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with comma and outputText", "a,c|def", "a,c", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Escaped comma label with outputText", "a\\,c|def", "a,c", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Escaped label with outputText", "a\\|c|def", "a|c", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped bar outputText", "abc|d\\|f", "abc", "d|f", null,
- Keyboard.CODE_DUMMY);
- assertParser("Escaped escape label with outputText", "a\\\\|def", "a\\", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label starts with at and outputText", "@bc|def", "@bc", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label contains at label and outputText", "a@c|def", "a@c", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Escaped at label with outputText", "\\@bc|def", "@bc", "def", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with comma outputText", "abc|a,b", "abc", "a,b", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped comma outputText", "abc|a\\,b", "abc", "a,b", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with outputText starts with at", "abc|@bc", "abc", "@bc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with outputText contains at", "abc|a@c", "abc", "a@c", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped at outputText", "abc|\\@bc", "abc", "@bc", null,
- Keyboard.CODE_DUMMY);
- assertParser("Label with escaped bar outputText", "abc|d\\|f", "abc", "d|f",
- null, Keyboard.CODE_DUMMY);
- assertParser("Escaped bar label with escaped bar outputText", "a\\|c|d\\|f", "a|c", "d|f",
- null, Keyboard.CODE_DUMMY);
- assertParser("Label with code", "abc|" + CODE_SETTINGS, "abc", null, null, mCodeSettings);
- assertParser("Escaped label with code", "a\\|c|" + CODE_SETTINGS, "a|c", null, null,
- mCodeSettings);
+ assertParser("Simple label", "abc",
+ "abc", "abc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped bar", "a\\|c",
+ "a|c", "a|c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped escape", "a\\\\c",
+ "a\\c", "a\\c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with comma", "a,c",
+ "a,c", "a,c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped comma", "a\\,c",
+ "a,c", "a,c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label starts with at", "@bc",
+ "@bc", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label contains at", "a@c",
+ "a@c", "a@c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped at", "\\@bc",
+ "@bc", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped letter", "\\abc",
+ "abc", "abc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with outputText", "abc|def",
+ "abc", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with comma and outputText", "a,c|def",
+ "a,c", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Escaped comma label with outputText", "a\\,c|def",
+ "a,c", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Escaped label with outputText", "a\\|c|def",
+ "a|c", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped bar outputText", "abc|d\\|f",
+ "abc", "d|f", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Escaped escape label with outputText", "a\\\\|def",
+ "a\\", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label starts with at and outputText", "@bc|def",
+ "@bc", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label contains at label and outputText", "a@c|def",
+ "a@c", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Escaped at label with outputText", "\\@bc|def",
+ "@bc", "def", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with comma outputText", "abc|a,b",
+ "abc", "a,b", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped comma outputText", "abc|a\\,b",
+ "abc", "a,b", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with outputText starts with at", "abc|@bc",
+ "abc", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with outputText contains at", "abc|a@c",
+ "abc", "a@c", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped at outputText", "abc|\\@bc",
+ "abc", "@bc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with escaped bar outputText", "abc|d\\|f",
+ "abc", "d|f", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Escaped bar label with escaped bar outputText", "a\\|c|d\\|f",
+ "a|c", "d|f", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParser("Label with code", "abc|" + CODE_SETTINGS,
+ "abc", null, ICON_UNDEFINED, mCodeSettings);
+ assertParser("Escaped label with code", "a\\|c|" + CODE_SETTINGS,
+ "a|c", null, ICON_UNDEFINED, mCodeSettings);
}
public void testIconAndCode() {
- assertParser("Icon with outputText", ICON_SETTINGS + "|abc", null, "abc", mIconSettings,
- Keyboard.CODE_DUMMY);
- assertParser("Icon with outputText starts with at", ICON_SETTINGS + "|@bc", null, "@bc",
- mIconSettings, Keyboard.CODE_DUMMY);
- assertParser("Icon with outputText contains at", ICON_SETTINGS + "|a@c", null, "a@c",
- mIconSettings, Keyboard.CODE_DUMMY);
- assertParser("Icon with escaped at outputText", ICON_SETTINGS + "|\\@bc", null, "@bc",
- mIconSettings, Keyboard.CODE_DUMMY);
- assertParser("Label starts with at and code", "@bc|" + CODE_SETTINGS, "@bc", null, null,
- mCodeSettings);
- assertParser("Label contains at and code", "a@c|" + CODE_SETTINGS, "a@c", null, null,
- mCodeSettings);
- assertParser("Escaped at label with code", "\\@bc|" + CODE_SETTINGS, "@bc", null, null,
- mCodeSettings);
- assertParser("Icon with code", ICON_SETTINGS + "|" + CODE_SETTINGS, null, null,
- mIconSettings, mCodeSettings);
+ assertParser("Icon with outputText", ICON_SETTINGS + "|abc",
+ null, "abc", ICON_SETTINGS_KEY, Keyboard.CODE_DUMMY);
+ assertParser("Icon with outputText starts with at", ICON_SETTINGS + "|@bc",
+ null, "@bc", ICON_SETTINGS_KEY, Keyboard.CODE_DUMMY);
+ assertParser("Icon with outputText contains at", ICON_SETTINGS + "|a@c",
+ null, "a@c", ICON_SETTINGS_KEY, Keyboard.CODE_DUMMY);
+ assertParser("Icon with escaped at outputText", ICON_SETTINGS + "|\\@bc",
+ null, "@bc", ICON_SETTINGS_KEY, Keyboard.CODE_DUMMY);
+ assertParser("Label starts with at and code", "@bc|" + CODE_SETTINGS,
+ "@bc", null, ICON_UNDEFINED, mCodeSettings);
+ assertParser("Label contains at and code", "a@c|" + CODE_SETTINGS,
+ "a@c", null, ICON_UNDEFINED, mCodeSettings);
+ assertParser("Escaped at label with code", "\\@bc|" + CODE_SETTINGS,
+ "@bc", null, ICON_UNDEFINED, mCodeSettings);
+ assertParser("Icon with code", ICON_SETTINGS + "|" + CODE_SETTINGS,
+ null, null, ICON_SETTINGS_KEY, mCodeSettings);
}
public void testFormatError() {
- assertParserError("Empty spec", "", null, null, null, Keyboard.CODE_UNSPECIFIED);
- assertParserError("Empty label with outputText", "|a", null, "a", null,
- Keyboard.CODE_DUMMY);
- assertParserError("Empty label with code", "|" + CODE_SETTINGS, null, null, null,
- mCodeSettings);
- assertParserError("Empty outputText with label", "a|", "a", null, null,
- Keyboard.CODE_UNSPECIFIED);
- assertParserError("Empty outputText with icon", ICON_SETTINGS + "|", null, null,
- mIconSettings, Keyboard.CODE_UNSPECIFIED);
- assertParserError("Empty icon and code", "|", null, null, null, Keyboard.CODE_UNSPECIFIED);
- assertParserError("Icon without code", ICON_SETTINGS, null, null, mIconSettings,
- Keyboard.CODE_DUMMY);
- assertParserError("Non existing icon", ICON_NON_EXISTING + "|abc", null, "abc", null,
- Keyboard.CODE_DUMMY);
- assertParserError("Non existing code", "abc|" + CODE_NON_EXISTING, "abc", null, null,
- Keyboard.CODE_UNSPECIFIED);
- assertParserError("Third bar at end", "a|b|", "a", null, null, Keyboard.CODE_UNSPECIFIED);
- assertParserError("Multiple bar", "a|b|c", "a", null, null, Keyboard.CODE_UNSPECIFIED);
- assertParserError("Multiple bar with label and code", "a|" + CODE_SETTINGS + "|c", "a",
- null, null, mCodeSettings);
- assertParserError("Multiple bar with icon and outputText", ICON_SETTINGS + "|b|c", null,
- null, mIconSettings, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Empty spec", "", null,
+ null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Empty label with outputText", "|a",
+ null, "a", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParserError("Empty label with code", "|" + CODE_SETTINGS,
+ null, null, ICON_UNDEFINED, mCodeSettings);
+ assertParserError("Empty outputText with label", "a|",
+ "a", null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Empty outputText with icon", ICON_SETTINGS + "|",
+ null, null, ICON_SETTINGS_KEY, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Empty icon and code", "|",
+ null, null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Icon without code", ICON_SETTINGS,
+ null, null, ICON_SETTINGS_KEY, Keyboard.CODE_DUMMY);
+ assertParser("Non existing icon", ICON_NON_EXISTING + "|abc",
+ null, "abc", ICON_UNDEFINED, Keyboard.CODE_DUMMY);
+ assertParserError("Non existing code", "abc|" + CODE_NON_EXISTING,
+ "abc", null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Third bar at end", "a|b|",
+ "a", null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Multiple bar", "a|b|c",
+ "a", null, ICON_UNDEFINED, Keyboard.CODE_UNSPECIFIED);
+ assertParserError("Multiple bar with label and code", "a|" + CODE_SETTINGS + "|c",
+ "a", null, ICON_UNDEFINED, mCodeSettings);
+ assertParserError("Multiple bar with icon and outputText", ICON_SETTINGS + "|b|c",
+ null, null, ICON_SETTINGS_KEY, Keyboard.CODE_UNSPECIFIED);
assertParserError("Multiple bar with icon and code",
- ICON_SETTINGS + "|" + CODE_SETTINGS + "|c", null, null, mIconSettings,
- mCodeSettings);
+ ICON_SETTINGS + "|" + CODE_SETTINGS + "|c",
+ null, null, ICON_SETTINGS_KEY, mCodeSettings);
}
}
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-08 23:21:32 +0000