Merge "Fix a race condition that makes tests unstable" (cfec7e72) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/LatinIME.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		private View mKeyPreviewBackingView;
		private View mSuggestionsContainer;
		private SuggestionsView mSuggestionsView;
		private Suggest mSuggest;
		/* package for tests */ Suggest mSuggest;
		private CompletionInfo[] mApplicationSpecifiedCompletions;

		private InputMethodManagerCompatWrapper mImm;

+14 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,20 @@ public class InputLogicTests extends ServiceTestCase<LatinIME> {
		mLatinIME.onStartInputView(ei, false);
		mLatinIME.onCreateInputMethodInterface().startInput(ic, ei);
		mInputConnection = ic;
		// Wait for the main dictionary to be loaded (we need it for auto-correction tests)
		int remainingAttempts = 10;
		while (remainingAttempts > 0 && !mLatinIME.mSuggest.hasMainDictionary()) {
		try {
		Thread.sleep(100);
		} catch (InterruptedException e) {
		// Don't do much
		} finally {
		--remainingAttempts;
		}
		}
		if (!mLatinIME.mSuggest.hasMainDictionary()) {
		throw new RuntimeException("Can't initialize the main dictionary");
		}
		}

		// type(int) and type(String): helper methods to send a code point resp. a string to LatinIME.