Use external/robolectric-shadows/run_robotests.mk

This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7

tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.language;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -28,6 +27,7 @@ import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
+import android.arch.lifecycle.LifecycleObserver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -42,14 +42,11 @@ import android.view.inputmethod.InputMethodManager;
 import android.view.textservice.TextServicesManager;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,13 +55,11 @@ import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LanguageAndInputSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -127,9 +122,6 @@ public class LanguageAndInputSettingsTest {
     }
 
     @Test
-    @Config(shadows = {
-            ShadowSecureSettings.class,
-    })
     public void testSummary_shouldSetToCurrentImeName() {
         final Activity activity = mock(Activity.class);
         final SummaryLoader loader = mock(SummaryLoader.class);
@@ -145,7 +137,7 @@ public class LanguageAndInputSettingsTest {
         when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
         when(mInputMethodManager.getInputMethodList()).thenReturn(imis);
 
-        SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+        SummaryLoader.SummaryProvider provider = LanguageAndInputSettings.SUMMARY_PROVIDER_FACTORY
                 .createSummaryProvider(activity, loader);
 
         provider.setListening(true);
@@ -158,18 +150,17 @@ public class LanguageAndInputSettingsTest {
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         final Resources res = spy(RuntimeEnvironment.application.getResources());
-        //(InputManager) context.getSystemService(Context.INPUT_SERVICE);
         final InputManager inputManager = mock(InputManager.class);
         final TextServicesManager textServicesManager = mock(TextServicesManager.class);
-        when(inputManager.getInputDeviceIds()).thenReturn(new int[]{});
+        when(inputManager.getInputDeviceIds()).thenReturn(new int[0]);
         doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE);
-        doReturn(textServicesManager).when(context).getSystemService(
-                Context.TEXT_SERVICES_MANAGER_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);
-        final List<String> niks = LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(context);
+        final List<String> niks =
+            LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
         LanguageAndInputSettings settings = new LanguageAndInputSettings();
         final int xmlId = settings.getPreferenceScreenResId();
 
@@ -182,11 +173,11 @@ public class LanguageAndInputSettingsTest {
     public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
         final Context context = spy(RuntimeEnvironment.application);
         final TextServicesManager textServicesManager = mock(TextServicesManager.class);
-        doReturn(textServicesManager).when(context).getSystemService(
-                Context.TEXT_SERVICES_MANAGER_SERVICE);
+        doReturn(textServicesManager).when(context)
+            .getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
         final LanguageAndInputSettings fragment = new LanguageAndInputSettings();
-        final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
-                fragment.getPreferenceScreenResId());
+        final List<String> preferenceScreenKeys =
+            XmlTestUtils.getKeysFromPreferenceXml(context, fragment.getPreferenceScreenResId());
         final List<String> preferenceKeys = new ArrayList<>();
 
         for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {

tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.language;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -26,14 +25,12 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -43,7 +40,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PhoneLanguagePreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java

@@ -17,24 +17,20 @@
 package com.android.settings.language;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PointerSpeedControllerTest {
 
   private Context mContext;

tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java

@@ -27,13 +27,11 @@ import android.speech.tts.TtsEngines;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -43,7 +41,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class TtsPreferenceControllerTest {
 
     @Mock
@@ -94,7 +91,6 @@ public class TtsPreferenceControllerTest {
     @Test
     @Config(qualifiers = "mcc999")
     public void testIsAvailable_ifDisabled_shouldReturnFalse() {
-
         assertThat(mController.isAvailable()).isFalse();
     }
 }

tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java

@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.TestConfig;
 import com.android.settings.inputmethod.UserDictionaryList;
 import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -33,13 +32,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.TreeSet;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UserDictionaryPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -52,7 +49,7 @@ public class UserDictionaryPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest();
         mController = new TestController(mContext);
-        mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+        mPreference = new Preference(RuntimeEnvironment.application);
     }
 
     @Test
@@ -74,10 +71,9 @@ public class UserDictionaryPreferenceControllerTest {
 
         mController.updateState(mPreference);
 
-        assertThat(mPreference.getFragment())
-                .isEqualTo(UserDictionarySettings.class.getCanonicalName());
-        assertThat(mPreference.getExtras().getString("locale"))
-                .isEqualTo("en");
+        final String fragmentName = UserDictionarySettings.class.getCanonicalName();
+        assertThat(mPreference.getFragment()).isEqualTo(fragmentName);
+        assertThat(mPreference.getExtras().getString("locale")).isEqualTo("en");
     }
 
     @Test
@@ -102,9 +98,8 @@ public class UserDictionaryPreferenceControllerTest {
             return mLocales;
         }
 
-        public TestController(Context context) {
+        private TestController(Context context) {
             super(context);
         }
     }
-
 }