aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-03-26 03:10:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-26 03:10:21 -0700
commit65ed97a31de6ab85b5116d71d3c709d573fa972f (patch)
tree2069390efb25a142969e3b8422b77a97534dc688 /tests/src
parente986e036edd38bfa7b8dc6498e7f60a89ea1cd5e (diff)
parentc4b558d375c6db58bb976b8d089aa157e54534b8 (diff)
downloadlatinime-65ed97a31de6ab85b5116d71d3c709d573fa972f.tar.gz
latinime-65ed97a31de6ab85b5116d71d3c709d573fa972f.tar.xz
latinime-65ed97a31de6ab85b5116d71d3c709d573fa972f.zip
am c4b558d3: Merge "Rename text resources consistently"
* commit 'c4b558d375c6db58bb976b8d089aa157e54534b8': Rename text resources consistently
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java4
-rw-r--r--tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
index 7923afc1a..b8cb11b6b 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
@@ -251,14 +251,14 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase {
}
public void testResourceReference() {
- assertParser("Settings as more key", "!text/settings_as_more_key",
+ assertParser("Settings as more key", "!text/keyspec_settings",
null, null, mSettingsIconId, mCodeSettings);
assertParser("Action next as more key", "!text/label_next_key|!code/key_action_next",
"Next", null, ICON_UNDEFINED, mCodeActionNext);
assertParser("Popular domain",
- "!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain ",
+ "!text/keyspec_popular_domain|!text/keyspec_popular_domain ",
".com", ".com ", ICON_UNDEFINED, CODE_OUTPUT_TEXT);
}
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
index a1933076a..514ad1cf0 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
@@ -355,16 +355,16 @@ public class MoreKeySpecSplitTests extends InstrumentationTestCase {
}
public void testLabelReferece() {
- assertTextArray("Label time am", "!text/label_time_am", "AM");
+ assertTextArray("Label time am", "!text/keylabel_time_am", "AM");
- assertTextArray("More keys for am pm", "!text/more_keys_for_am_pm",
+ assertTextArray("More keys for am pm", "!text/morekeys_am_pm",
"!fixedColumnOrder!2", "!hasLabels!", "AM", "PM");
- assertTextArray("Settings as more key", "!text/settings_as_more_key",
+ assertTextArray("Settings as more key", "!text/keyspec_settings",
"!icon/settings_key|!code/key_settings");
assertTextArray("Indirect naviagte actions as more key",
- "!text/indirect_navigate_actions_as_more_key",
+ "!text/keyspec_indirect_navigate_actions",
"!fixedColumnOrder!2",
"!hasLabels!", "Prev|!code/key_action_previous",
"!hasLabels!", "Next|!code/key_action_next");