2 files changed, 5 insertions, 66 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
index b64ab8c80..570865738 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
@@ -51,7 +51,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         final KeyboardTheme keyboardTheme = KeyboardTheme.searchKeyboardThemeById(
-                getKeyboardThemeForTests(), KeyboardTheme.KEYBOARD_THEMES);
+                getKeyboardThemeForTests());
         setContext(new ContextThemeWrapper(getContext(), keyboardTheme.mStyleId));
         KeyboardLayoutSet.onKeyboardThemeChanged();
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
index 34cf4072f..c20954f81 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
@@ -28,8 +28,6 @@ import android.preference.PreferenceManager;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import java.util.Arrays;
-
 @SmallTest
 public class KeyboardThemeTests extends AndroidTestCase {
     private SharedPreferences mPrefs;
@@ -79,9 +77,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
     }
 
     private void assertKeyboardTheme(final int sdkVersion, final int expectedThemeId) {
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, KeyboardTheme.KEYBOARD_THEMES);
-        assertEquals(expectedThemeId, actualTheme.mThemeId);
+        assertEquals(expectedThemeId, KeyboardTheme.getKeyboardTheme(mPrefs, sdkVersion).mThemeId);
     }
 
     /*
@@ -143,8 +139,8 @@ public class KeyboardThemeTests extends AndroidTestCase {
         final String oldPrefKey = KeyboardTheme.KLP_KEYBOARD_THEME_KEY;
         setKeyboardThemePreference(oldPrefKey, previousThemeId);
 
-        final KeyboardTheme defaultTheme = KeyboardTheme.getDefaultKeyboardTheme(
-                mPrefs, sdkVersion, KeyboardTheme.KEYBOARD_THEMES);
+        final KeyboardTheme defaultTheme =
+                KeyboardTheme.getDefaultKeyboardTheme(mPrefs, sdkVersion);
 
         assertNotNull(defaultTheme);
         assertEquals(expectedThemeId, defaultTheme.mThemeId);
@@ -198,8 +194,7 @@ public class KeyboardThemeTests extends AndroidTestCase {
         // Clean up new keyboard theme preference to simulate "upgrade to LXX keyboard".
         setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
 
-        final KeyboardTheme theme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, KeyboardTheme.KEYBOARD_THEMES);
+        final KeyboardTheme theme = KeyboardTheme.getKeyboardTheme(mPrefs, sdkVersion);
 
         assertNotNull(theme);
         assertEquals(expectedThemeId, theme.mThemeId);
@@ -346,60 +341,4 @@ public class KeyboardThemeTests extends AndroidTestCase {
         assertUpgradePlatformFromTo(
                 oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT);
     }
-
-    /*
-     * Test for missing selected theme.
-     */
-    private static KeyboardTheme[] LIMITED_THEMES = {
-        KeyboardTheme.searchKeyboardThemeById(THEME_ID_ICS, KeyboardTheme.KEYBOARD_THEMES),
-        KeyboardTheme.searchKeyboardThemeById(THEME_ID_KLP, KeyboardTheme.KEYBOARD_THEMES)
-    };
-    static {
-        Arrays.sort(LIMITED_THEMES);
-    }
-
-    public void testMissingSelectedThemeIcs() {
-        // Clean up preferences.
-        setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-        setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-
-        final int sdkVersion = VERSION_CODES.ICE_CREAM_SANDWICH;
-        final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
-        setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_LIGHT);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
-    }
-
-    public void testMissingSelectedThemeKlp() {
-        // Clean up preferences.
-        setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-        setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-
-        final int sdkVersion = VERSION_CODES.KITKAT;
-        final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
-        setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_LIGHT);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
-    }
-
-    public void testMissingSelectedThemeLxx() {
-        // Clean up preferences.
-        setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-        setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL);
-
-        final int sdkVersion = VERSION_CODES_LXX;
-        final String oldPrefKey = KeyboardTheme.getPreferenceKey(sdkVersion);
-        setKeyboardThemePreference(oldPrefKey, THEME_ID_LXX_DARK);
-
-        final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
-                mPrefs, sdkVersion, LIMITED_THEMES);
-        // LXX_DARK is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
-    }
 }