From 74c321a481e467748bc9c077daf2749c7162b321 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 30 Nov 2017 14:35:55 -0800 Subject: [PATCH 1/2] Update LanguageAndInputSettingsTest to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I432bc610eb4bec1baa61b4c7b6c58302855fe77b --- .../language/LanguageAndInputSettingsTest.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 141d59d5609..da996e8f4ba 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -64,7 +64,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class LanguageAndInputSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -159,12 +159,15 @@ public class LanguageAndInputSettingsTest { final Context context = spy(RuntimeEnvironment.application); final Resources res = spy(RuntimeEnvironment.application.getResources()); //(InputManager) context.getSystemService(Context.INPUT_SERVICE); - InputManager manager = mock(InputManager.class); - when(manager.getInputDeviceIds()).thenReturn(new int[]{}); - doReturn(manager).when(context).getSystemService(Context.INPUT_SERVICE); + final InputManager inputManager = mock(InputManager.class); + final TextServicesManager textServicesManager = mock(TextServicesManager.class); + when(inputManager.getInputDeviceIds()).thenReturn(new int[]{}); + doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE); + doReturn(textServicesManager).when(context).getSystemService( + Context.TEXT_SERVICES_MANAGER_SERVICE); doReturn(res).when(context).getResources(); doReturn(false).when(res) - .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys); + .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys); final List niks = LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(context); LanguageAndInputSettings settings = new LanguageAndInputSettings(); @@ -177,7 +180,10 @@ public class LanguageAndInputSettingsTest { @Test public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() { - final Context context = RuntimeEnvironment.application; + final Context context = spy(RuntimeEnvironment.application); + final TextServicesManager textServicesManager = mock(TextServicesManager.class); + doReturn(textServicesManager).when(context).getSystemService( + Context.TEXT_SERVICES_MANAGER_SERVICE); final LanguageAndInputSettings fragment = new LanguageAndInputSettings(); final List preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context, fragment.getPreferenceScreenResId()); From c06205f3072751c1a88d8e7c08af9e3ca352b186 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 30 Nov 2017 14:36:08 -0800 Subject: [PATCH 2/2] update language package test to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I7ed2070a7c54eff34803b473d9fe67cea12424cd --- .../language/PhoneLanguagePreferenceControllerTest.java | 2 +- .../language/UserDictionaryPreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 7b315aaf92a..485efbef336 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PhoneLanguagePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index 26a160d0b77..77d60cb4123 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.shadows.ShadowApplication; import java.util.TreeSet; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UserDictionaryPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS)