From 7ae6721ffad1e79ee446de87d13f18a27619830b Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 10 Feb 2014 17:48:35 +0900 Subject: Remove RTL aware !code and add corresponding !text Change-Id: I9021c8fa1cf2d4ac07579237a939c15551509a0b --- .../android/inputmethod/keyboard/internal/KeySpecParserTests.java | 2 +- .../inputmethod/keyboard/internal/KeySpecParserTestsBase.java | 6 ++---- .../com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/src') diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java index 9e43bd4d2..8e26e7fc7 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java @@ -33,7 +33,7 @@ public final class KeySpecParserTests extends KeySpecParserTestsBase { final String actualLabel = KeySpecParser.getLabel(keySpecResolved); final String actualOutputText = KeySpecParser.getOutputText(keySpecResolved); final int actualIcon = KeySpecParser.getIconId(keySpecResolved); - final int actualCode = KeySpecParser.getCode(keySpecResolved, mCodesSet); + final int actualCode = KeySpecParser.getCode(keySpecResolved); assertEquals(message + " [label]", expectedLabel, actualLabel); assertEquals(message + " [ouptputText]", expectedOutputText, actualOutputText); assertEquals(message + " [icon]", diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java index edeb6a6c2..c342533c8 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java @@ -32,7 +32,6 @@ import java.util.Locale; abstract class KeySpecParserTestsBase extends AndroidTestCase { private final static Locale TEST_LOCALE = Locale.ENGLISH; - protected final KeyboardCodesSet mCodesSet = new KeyboardCodesSet(); protected final KeyboardTextsSet mTextsSet = new KeyboardTextsSet(); private static final String CODE_SETTINGS_NAME = "key_settings"; @@ -52,7 +51,6 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); - mCodesSet.setLocale(TEST_LOCALE); mTextsSet.setLocale(TEST_LOCALE); final Context context = getContext(); new RunInLocale() { @@ -63,8 +61,8 @@ abstract class KeySpecParserTestsBase extends AndroidTestCase { } }.runInLocale(context.getResources(), TEST_LOCALE); - mCodeSettings = mCodesSet.getCode(CODE_SETTINGS_NAME); - mCodeActionNext = mCodesSet.getCode("key_action_next"); + mCodeSettings = KeyboardCodesSet.getCode(CODE_SETTINGS_NAME); + mCodeActionNext = KeyboardCodesSet.getCode("key_action_next"); mSettingsIconId = KeyboardIconsSet.getIconId(ICON_SETTINGS_NAME); } diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java index ea25bcf37..6c0d74941 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java @@ -33,8 +33,8 @@ public final class MoreKeySpecTests extends KeySpecParserTestsBase { final String expectedLabel, final String expectedOutputText, final int expectedIconId, final int expectedCode) { final String labelResolved = mTextsSet.resolveTextReference(moreKeySpec); - final MoreKeySpec spec = new MoreKeySpec(labelResolved, false /* needsToUpperCase */, - Locale.US, mCodesSet); + final MoreKeySpec spec = new MoreKeySpec( + labelResolved, false /* needsToUpperCase */, Locale.US); assertEquals(message + " [label]", expectedLabel, spec.mLabel); assertEquals(message + " [ouptputText]", expectedOutputText, spec.mOutputText); assertEquals(message + " [icon]", -- cgit v1.2.3-83-g751a