Merge "Fix unit tests." (4b6660f8) · Commits · e / os / android_packages_inputmethods_LatinIME

tests/src/com/android/inputmethod/latin/InputLogicTestsReorderingMyanmar.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ public class InputLogicTestsReorderingMyanmar extends InputTestsBase {

		public void testMyanmarReordering() {
		int testNumber = 0;
		changeLanguage("mm_MY");
		changeLanguage("my_MM", "CombiningRules=MyanmarReordering");
		for (final Pair[] test : TESTS) {
		// Small trick to reset LatinIME : setText("") and send updateSelection with values
		// LatinIME has never seen, and cursor pos 0,0.

tests/src/com/android/inputmethod/latin/InputTestsBase.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -299,11 +299,15 @@ public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> {
		}

		protected void changeLanguage(final String locale) {
		changeLanguageWithoutWait(locale);
		changeLanguage(locale, null);
		}

		protected void changeLanguage(final String locale, final String combiningSpec) {
		changeLanguageWithoutWait(locale, combiningSpec);
		waitForDictionariesToBeLoaded();
		}

		protected void changeLanguageWithoutWait(final String locale) {
		protected void changeLanguageWithoutWait(final String locale, final String combiningSpec) {
		mEditText.mCurrentLocale = LocaleUtils.constructLocaleFromString(locale);
		// TODO: this is forcing a QWERTY keyboard for all locales, which is wrong.
		// It's still better than using whatever keyboard is the current one, but we
		@@ -314,7 +318,8 @@ public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> {
		"KeyboardLayoutSet=" + SubtypeLocaleUtils.QWERTY
		+ "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE
		+ "," + Constants.Subtype.ExtraValue.ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE
		+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
		+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE
		+ null == combiningSpec ? "" : ("," + combiningSpec);
		final InputMethodSubtype subtype = InputMethodSubtypeCompatUtils.newInputMethodSubtype(
		R.string.subtype_no_language_qwerty,
		R.drawable.ic_ime_switcher_dark,
		@@ -325,7 +330,7 @@ public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> {
		false /* overridesImplicitlyEnabledSubtype */,
		0 /* id */);
		SubtypeSwitcher.getInstance().forceSubtype(subtype);
		mLatinIME.loadKeyboard();
		mLatinIME.onCurrentInputMethodSubtypeChanged(subtype);
		runMessages();
		mKeyboard = mLatinIME.mKeyboardSwitcher.getKeyboard();
		mLatinIME.clearPersonalizedDictionariesForTest();

tests/src/com/android/inputmethod/latin/LatinImeStressTests.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,8 @@ public class LatinImeStressTests extends InputTestsBase {
		final int codePointSetSize = 30;
		final int[] codePointSet = CodePointUtils.LATIN_ALPHABETS_LOWER;
		for (int i = 0; i < switchCount; ++i) {
		changeLanguageWithoutWait(locales[random.nextInt(locales.length)]);
		changeLanguageWithoutWait(locales[random.nextInt(locales.length)],
		null /* combiningSpec */);
		final int wordCount = random.nextInt(maxWordCountToTypeInEachIteration);
		for (int j = 0; j < wordCount; ++j) {
		final String word = CodePointUtils.generateWord(random, codePointSet);
		@@ -50,7 +51,8 @@ public class LatinImeStressTests extends InputTestsBase {
		final int codePointSetSize = 30;
		final int[] codePointSet = CodePointUtils.generateCodePointSet(codePointSetSize, random);
		for (int i = 0; i < switchCount; ++i) {
		changeLanguageWithoutWait(locales[random.nextInt(locales.length)]);
		changeLanguageWithoutWait(locales[random.nextInt(locales.length)],
		null /* combiningSpec */);
		final int wordCount = random.nextInt(maxWordCountToTypeInEachIteration);
		for (int j = 0; j < wordCount; ++j) {
		final String word = CodePointUtils.generateWord(random, codePointSet);