diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-12-12 04:42:07 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-12-12 04:42:09 +0000 |
| commit | 8cfad7ed64d08c5a131c9c539aa4fc964030c214 (patch) | |
| tree | 1b018ac4d46eaeb613bf54f938b7a79ad05ddc1a /tests/src | |
| parent | 498dbfbd9dcd9a03b91b6efe4d0e5b3afb1df078 (diff) | |
| parent | 4934a88b618f06600e2d725a43bdd2511715b4ca (diff) | |
| download | latinime-8cfad7ed64d08c5a131c9c539aa4fc964030c214.tar.gz latinime-8cfad7ed64d08c5a131c9c539aa4fc964030c214.tar.xz latinime-8cfad7ed64d08c5a131c9c539aa4fc964030c214.zip | |
Merge "Make LanguageOnSpacebarHelper as utility class"
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java (renamed from tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java) | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java b/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java index 6bb255b01..7f7f493b1 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.inputmethod.keyboard.internal; +package com.android.inputmethod.latin.utils; -import static com.android.inputmethod.keyboard.internal.LanguageOnSpacebarHelper.FORMAT_TYPE_FULL_LOCALE; -import static com.android.inputmethod.keyboard.internal.LanguageOnSpacebarHelper.FORMAT_TYPE_LANGUAGE_ONLY; -import static com.android.inputmethod.keyboard.internal.LanguageOnSpacebarHelper.FORMAT_TYPE_NONE; +import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_FULL_LOCALE; +import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_LANGUAGE_ONLY; +import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_NONE; import android.content.Context; import android.test.AndroidTestCase; @@ -28,6 +28,7 @@ import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.latin.RichInputMethodManager; import com.android.inputmethod.latin.RichInputMethodSubtype; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; +import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import java.util.ArrayList; @@ -36,10 +37,7 @@ import java.util.Locale; import javax.annotation.Nonnull; @SmallTest -public class LanguageOnSpacebarHelperTests extends AndroidTestCase { - private final LanguageOnSpacebarHelper mLanguageOnSpacebarHelper = - new LanguageOnSpacebarHelper(); - +public class LanguageOnSpacebarUtilsTests extends AndroidTestCase { private RichInputMethodManager mRichImm; RichInputMethodSubtype EN_US_QWERTY; @@ -84,21 +82,21 @@ public class LanguageOnSpacebarHelperTests extends AndroidTestCase { return new RichInputMethodSubtype(subtype); } - private void enableSubtypes(final RichInputMethodSubtype ... subtypes) { + private static void enableSubtypes(final RichInputMethodSubtype ... subtypes) { final ArrayList<InputMethodSubtype> enabledSubtypes = new ArrayList<>(); for (final RichInputMethodSubtype subtype : subtypes) { enabledSubtypes.add(subtype.getRawSubtype()); } - mLanguageOnSpacebarHelper.onUpdateEnabledSubtypes(enabledSubtypes); + LanguageOnSpacebarUtils.setEnabledSubtypes(enabledSubtypes); } - private void assertFormatType(final RichInputMethodSubtype subtype, + private static void assertFormatType(final RichInputMethodSubtype subtype, final boolean implicitlyEnabledSubtype, final Locale systemLocale, final int expectedFormat) { - mLanguageOnSpacebarHelper.onSubtypeChanged(subtype, implicitlyEnabledSubtype, systemLocale); + LanguageOnSpacebarUtils.onSubtypeChanged(subtype, implicitlyEnabledSubtype, systemLocale); assertEquals(subtype.getLocales()[0] + " implicitly=" + implicitlyEnabledSubtype + " in " + systemLocale, expectedFormat, - mLanguageOnSpacebarHelper.getLanguageOnSpacebarFormatType(subtype)); + LanguageOnSpacebarUtils.getLanguageOnSpacebarFormatType(subtype)); } public void testOneSubtypeImplicitlyEnabled() { |