nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use InputMethodInfo.getSubtypeAt() to list all subtype in test"

main
Tadashi G. Takaoka 2012-04-03 20:27:06 -07:00 committed by Android (Google) Code Review
parent 1bdc2ca1d9 52d50f9bd1
commit e0d06fa793
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/android/inputmethod/latin/InputLogicFrenchTests.java
View File

@ -16,8 +16,6 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.keyboard.Keyboard;
public class InputLogicFrenchTests extends InputTestsBase { public class InputLogicFrenchTests extends InputTestsBase {
public void testAutoCorrectForFrench() { public void testAutoCorrectForFrench() {

13
tests/src/com/android/inputmethod/latin/InputTestsBase.java
View File

@ -138,17 +138,20 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> {
final InputMethodManager imm = (InputMethodManager)mLatinIME.getSystemService( final InputMethodManager imm = (InputMethodManager)mLatinIME.getSystemService(
Context.INPUT_METHOD_SERVICE); Context.INPUT_METHOD_SERVICE);
final String packageName = mLatinIME.getPackageName(); final String packageName = mLatinIME.getPackageName();
for (final InputMethodInfo imi : imm.getEnabledInputMethodList()) { // The IMEs and subtypes don't need to be enabled to run this test because IMF isn't
// involved here.
for (final InputMethodInfo imi : imm.getInputMethodList()) {
if (imi.getPackageName().equals(packageName)) { if (imi.getPackageName().equals(packageName)) {
for (final InputMethodSubtype ims : final int subtypeCount = imi.getSubtypeCount();
imm.getEnabledInputMethodSubtypeList(imi, true)) { for (int i = 0; i < subtypeCount; i++) {
final InputMethodSubtype ims = imi.getSubtypeAt(i);
final String locale = ims.getLocale(); final String locale = ims.getLocale();
mSubtypeMap.put(locale, ims); mSubtypeMap.put(locale, ims);
} }
return; return;
} }
} }
fail("LatinIME is disabled"); fail("LatinIME is not found");
} }
// We need to run the messages added to the handler from LatinIME. The only way to do // We need to run the messages added to the handler from LatinIME. The only way to do
@ -176,7 +179,7 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> {
// The only way to get out of Looper#loop() is to call #quit() on it (or on its queue). // The only way to get out of Looper#loop() is to call #quit() on it (or on its queue).
// Once #quit() is called remaining messages are not processed, which is why we post // Once #quit() is called remaining messages are not processed, which is why we post
// a message that calls it instead of calling it directly. // a message that calls it instead of calling it directly.
looper.loop(); Looper.loop();
// Once #quit() has been called, the message queue has an "mQuiting" field that prevents // Once #quit() has been called, the message queue has an "mQuiting" field that prevents
// any subsequent post in this queue. However the queue itself is still fully functional! // any subsequent post in this queue. However the queue itself is still fully functional!