1 files changed, 7 insertions, 5 deletions
diff --git a/tests/src/com/android/inputmethod/latin/SuggestTestsBase.java b/tests/src/com/android/inputmethod/latin/SuggestTestsBase.java
index 4500c2aee..64f26743e 100644
--- a/tests/src/com/android/inputmethod/latin/SuggestTestsBase.java
+++ b/tests/src/com/android/inputmethod/latin/SuggestTestsBase.java
@@ -30,11 +30,6 @@ import java.io.InputStream;
 import java.util.Locale;
 
 public class SuggestTestsBase extends AndroidTestCase {
-    protected static final KeyboardId US_KEYBOARD_ID = new KeyboardId("en_US qwerty keyboard",
-            com.android.inputmethod.latin.R.xml.kbd_qwerty, KeyboardView.COLOR_SCHEME_WHITE,
-            Locale.US, Configuration.ORIENTATION_LANDSCAPE, KeyboardId.MODE_TEXT,
-            new EditorInfo(), false, false, false, false);
-
     protected File mTestPackageFile;
 
     @Override
@@ -43,6 +38,13 @@ public class SuggestTestsBase extends AndroidTestCase {
         mTestPackageFile = new File(getTestContext().getApplicationInfo().sourceDir);
     }
 
+    protected static KeyboardId createKeyboardId(Locale locale) {
+        return new KeyboardId(locale.toString() + " keyboard",
+                com.android.inputmethod.latin.R.xml.kbd_qwerty, KeyboardView.COLOR_SCHEME_WHITE,
+                locale, Configuration.ORIENTATION_LANDSCAPE, KeyboardId.MODE_TEXT,
+                new EditorInfo(), false, false, false, false);
+    }
+
     protected InputStream openTestRawResource(int resIdInTest) {
         return getTestContext().getResources().openRawResource(resIdInTest);
     }