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/gestures/AssistGestureSettingsPreferenceControllerTest.java

@@ -24,7 +24,6 @@ import android.content.Context;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
 
-import com.android.settings.TestConfig;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
@@ -42,26 +41,22 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-    manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
-    shadows = ShadowSecureSettings.class
-)
+@Config(shadows = ShadowSecureSettings.class)
 public class AssistGestureSettingsPreferenceControllerTest {
 
+    private static final String KEY_ASSIST = "gesture_assist";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFactory;
     private AssistGestureSettingsPreferenceController mController;
 
-    private static final String KEY_ASSIST = "gesture_assist";
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mFactory = FakeFeatureFactory.setupForTest();
-        mController = new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST,
-                false);
+        mController =
+            new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST, false);
     }
 
     @Test

tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java

@@ -24,7 +24,6 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -33,13 +32,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AssistGestureSettingsTest {
 
     private FakeFeatureFactory mFakeFeatureFactory;
@@ -62,8 +58,7 @@ public class AssistGestureSettingsTest {
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
                 AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+                    RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
@@ -79,4 +74,3 @@ public class AssistGestureSettingsTest {
                 .contains("gesture_assist_settings_page");
     }
 }
-

tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java

@@ -28,7 +28,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
 
-import com.android.settings.TestConfig;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
@@ -41,26 +40,22 @@ import org.junit.After;
 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;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        SettingsShadowResources.class
-})
+@Config(shadows = SettingsShadowResources.class)
 public class DoubleTapPowerPreferenceControllerTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
+    private ContentResolver mContentResolver;
     private DoubleTapPowerPreferenceController mController;
     private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mContentResolver = mContext.getContentResolver();
         mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
     }
 
@@ -71,18 +66,16 @@ public class DoubleTapPowerPreferenceControllerTest {
 
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
-                .thenReturn(true);
+        SettingsShadowResources.overrideResource(
+            com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.TRUE);
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void isAvailable_configIsTrue_shouldReturnFalse() {
-        when(mContext.getResources().
-                getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
-                .thenReturn(false);
+        SettingsShadowResources.overrideResource(
+            com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.FALSE);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -90,10 +83,8 @@ public class DoubleTapPowerPreferenceControllerTest {
     @Test
     public void testSwitchEnabled_configIsNotSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        final Context context = RuntimeEnvironment.application;
-        Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
-        mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
+        Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+        mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
 
         assertThat(mController.isSwitchPrefEnabled()).isTrue();
     }
@@ -101,20 +92,17 @@ public class DoubleTapPowerPreferenceControllerTest {
     @Test
     public void testSwitchEnabled_configIsSet_shouldReturnFalse() {
         // Set the setting to be disabled.
-        final Context context = RuntimeEnvironment.application;
-        Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
-        mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
+        Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+        mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
 
     @Test
     public void testPreferenceController_ProperResultPayloadType() {
-        final Context context = RuntimeEnvironment.application;
         DoubleTapPowerPreferenceController controller =
-                new DoubleTapPowerPreferenceController(context, null /* lifecycle */,
-                        KEY_DOUBLE_TAP_POWER);
+            new DoubleTapPowerPreferenceController(mContext, null /* lifecycle */,
+                KEY_DOUBLE_TAP_POWER);
         ResultPayload payload = controller.getResultPayload();
         assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
     }
@@ -123,13 +111,12 @@ public class DoubleTapPowerPreferenceControllerTest {
     @Config(shadows = ShadowSecureSettings.class)
     public void testSetValue_updatesCorrectly() {
         int newValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
-                0);
+        Settings.Secure.putInt(mContentResolver,
+            Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
 
         InlinePayload payload = ((InlineSwitchPayload) mController.getResultPayload());
         payload.setValue(mContext, newValue);
-        int updatedValue = Settings.Secure.getInt(resolver,
+        int updatedValue = Settings.Secure.getInt(mContentResolver,
                 Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, -1);
         updatedValue = 1 - updatedValue; // DoubleTapPower is a non-standard switch
 
@@ -140,8 +127,7 @@ public class DoubleTapPowerPreferenceControllerTest {
     @Config(shadows = ShadowSecureSettings.class)
     public void testGetValue_correctValueReturned() {
         int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver,
+        Settings.Secure.putInt(mContentResolver,
                 Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, currentValue);
 
         int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
@@ -154,9 +140,7 @@ public class DoubleTapPowerPreferenceControllerTest {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
 
-        assertThat(
-                isSuggestionComplete(RuntimeEnvironment.application, null/* prefs */))
-                .isTrue();
+        assertThat(isSuggestionComplete(mContext, null/* prefs */)).isTrue();
     }
 
     @Test
@@ -164,12 +148,9 @@ public class DoubleTapPowerPreferenceControllerTest {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
-        final Context context = RuntimeEnvironment.application;
-        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
-                .getSharedPrefs(context);
-        assertThat(
-                isSuggestionComplete(RuntimeEnvironment.application, prefs))
-                .isFalse();
+        final SharedPreferences prefs =
+            new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+        assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
     }
 
     @Test
@@ -177,14 +158,10 @@ public class DoubleTapPowerPreferenceControllerTest {
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
         // No stored value in shared preferences if not visited yet.
-        final Context context = RuntimeEnvironment.application;
-        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
-                .getSharedPrefs(context);
-        prefs.edit().putBoolean(
-                DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+        final SharedPreferences prefs =
+            new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+        prefs.edit().putBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
 
-        assertThat(
-                isSuggestionComplete(RuntimeEnvironment.application, prefs))
-                .isTrue();
+        assertThat(isSuggestionComplete(mContext, prefs)).isTrue();
     }
 }

tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java

@@ -16,23 +16,20 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DoubleTapPowerSettingsTest {
 
     private DoubleTapPowerSettings mSettings;
@@ -45,9 +42,8 @@ public class DoubleTapPowerSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+            DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());

tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.gestures;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.when;
 
@@ -27,16 +26,13 @@ import android.content.SharedPreferences;
 import android.provider.Settings;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,7 +43,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DoubleTapScreenPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -65,11 +60,6 @@ public class DoubleTapScreenPreferenceControllerTest {
                 mContext, null, mAmbientDisplayConfiguration, 0, KEY_DOUBLE_TAP_SCREEN);
     }
 
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
@@ -127,8 +117,7 @@ public class DoubleTapScreenPreferenceControllerTest {
     @Config(shadows = ShadowSecureSettings.class)
     public void testGetValue_correctValueReturned() {
         int currentValue = 1;
-        ContentResolver resolver = mContext.getContentResolver();
-        Settings.Secure.putInt(resolver,
+        Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, currentValue);
 
         int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
@@ -141,25 +130,25 @@ public class DoubleTapScreenPreferenceControllerTest {
         when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
         // No stored value in shared preferences if not visited yet.
         final Context context = RuntimeEnvironment.application;
-        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
-                .getSharedPrefs(context);
+        final SharedPreferences prefs =
+            new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
 
-        assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
-                mAmbientDisplayConfiguration, prefs)).isFalse();
+        assertThat(DoubleTapScreenPreferenceController
+            .isSuggestionComplete(mAmbientDisplayConfiguration, prefs)).isFalse();
     }
 
     @Test
     public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
         when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
         final Context context = RuntimeEnvironment.application;
-        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
-                .getSharedPrefs(context);
+        final SharedPreferences prefs =
+            new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
 
         prefs.edit().putBoolean(
                 DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
 
-        assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
-                mAmbientDisplayConfiguration, prefs)).isTrue();
+        assertThat(DoubleTapScreenPreferenceController
+            .isSuggestionComplete(mAmbientDisplayConfiguration, prefs)).isTrue();
     }
 
     @Test

tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java

@@ -16,23 +16,20 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DoubleTapScreenSettingsTest {
 
     private DoubleTapScreenSettings mSettings;
@@ -45,9 +42,8 @@ public class DoubleTapScreenSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                DoubleTapScreenSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+            DoubleTapScreenSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());

tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java

@@ -16,23 +16,20 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DoubleTwistGestureSettingsTest {
 
     private DoubleTwistGestureSettings mSettings;
@@ -45,9 +42,8 @@ public class DoubleTwistGestureSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                DoubleTwistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+            DoubleTwistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());

tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java

@@ -29,11 +29,9 @@ import android.os.UserManager;
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.After;
 import org.junit.Before;
@@ -44,15 +42,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
-        SettingsShadowResources.class
-})
+@Config(shadows = SettingsShadowResources.class)
 public class DoubleTwistPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -119,12 +114,10 @@ public class DoubleTwistPreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = {
-            ShadowDoubleTwistPreferenceController.class,
-            ShadowSecureSettings.class})
+    @Config(shadows = ShadowDoubleTwistPreferenceController.class)
     public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
         final int managedId = 2;
-        ShadowSecureSettings.putIntForUser(
+        Settings.Secure.putIntForUser(
                 null, Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
         DoubleTwistPreferenceController controller =
                 spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
@@ -144,7 +137,7 @@ public class DoubleTwistPreferenceControllerTest {
     @Test
     public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(),
                 Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
         mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
@@ -155,7 +148,7 @@ public class DoubleTwistPreferenceControllerTest {
     @Test
     public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
         // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(),
                 Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
         mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);

tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java

@@ -29,7 +29,6 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.VideoPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,13 +40,10 @@ import org.mockito.Answers;
 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 GesturePreferenceControllerTest {
 
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -100,13 +96,13 @@ public class GesturePreferenceControllerTest {
         verify(videoPreference).onViewVisible(false);
 
         reset(videoPreference);
-        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
+        savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
         mController.onCreate(savedState);
         mController.onResume();
         verify(videoPreference).onViewVisible(true);
 
         reset(videoPreference);
-        savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
+        savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
         mController.onCreate(savedState);
         mController.onResume();
         verify(videoPreference).onViewVisible(false);
@@ -146,11 +142,11 @@ public class GesturePreferenceControllerTest {
 
         mController.mVideoPaused = true;
         mController.onSaveInstanceState(outState);
-        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
+        verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
 
         mController.mVideoPaused = false;
         mController.onSaveInstanceState(outState);
-        verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
+        verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
     }
 
     @Test
@@ -199,7 +195,7 @@ public class GesturePreferenceControllerTest {
         boolean mIsPrefAvailable;
         boolean mIsPrefEnabled;
 
-        public TestPrefController(Context context,
+        private TestPrefController(Context context,
                 Lifecycle lifecycle) {
             super(context, lifecycle);
         }

tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java

@@ -28,7 +28,6 @@ import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -48,7 +47,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class GesturesSettingsPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -93,7 +91,7 @@ public class GesturesSettingsPreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = {ShadowSecureSettings.class})
+    @Config(shadows = ShadowSecureSettings.class)
     public void updateState_assistSupported_shouldSetToAssistGestureStatus() {
         final FakeFeatureFactory featureFactory =
                 (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
@@ -120,7 +118,7 @@ public class GesturesSettingsPreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = {ShadowSecureSettings.class})
+    @Config(shadows = ShadowSecureSettings.class)
     public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
         final FakeFeatureFactory featureFactory =
                 (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
@@ -130,5 +128,4 @@ public class GesturesSettingsPreferenceControllerTest {
         mController.updateState(mPreference);
         verify(mPreference).setSummary("");
     }
-
 }

tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java

@@ -28,16 +28,12 @@ import android.content.SharedPreferences;
 import android.provider.Settings;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.search.InlinePayload;
 import com.android.settings.search.InlineSwitchPayload;
 import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,14 +41,12 @@ import org.mockito.Answers;
 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, shadows = {
-        SettingsShadowResources.class
-})
 public class PickupGesturePreferenceControllerTest {
 
+    private static final String KEY_PICK_UP = "gesture_pick_up";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
@@ -60,8 +54,6 @@ public class PickupGesturePreferenceControllerTest {
 
     private PickupGesturePreferenceController mController;
 
-    private static final String KEY_PICK_UP = "gesture_pick_up";
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -69,12 +61,6 @@ public class PickupGesturePreferenceControllerTest {
                 mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
     }
 
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-        ShadowSecureSettings.clear();
-    }
-
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
@@ -132,7 +118,6 @@ public class PickupGesturePreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = ShadowSecureSettings.class)
     public void testSetValue_updatesCorrectly() {
         int newValue = 1;
         ContentResolver resolver = mContext.getContentResolver();
@@ -146,7 +131,6 @@ public class PickupGesturePreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = ShadowSecureSettings.class)
     public void testGetValue_correctValueReturned() {
         int currentValue = 1;
         ContentResolver resolver = mContext.getContentResolver();
@@ -159,15 +143,12 @@ public class PickupGesturePreferenceControllerTest {
 
     @Test
     public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
-        when(mContext.getResources().getBoolean(anyInt()))
-                .thenReturn(true);
-        when(mContext.getResources().getString(anyInt()))
-                .thenReturn("foo");
+        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+        when(mContext.getResources().getString(anyInt())).thenReturn("foo");
         final Context context = RuntimeEnvironment.application;
-        final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
-                .getSharedPrefs(context);
-        prefs.edit().putBoolean(
-                PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+        final SharedPreferences prefs =
+            new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
+        prefs.edit().putBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
 
         assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))
                 .isTrue();

tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java

@@ -16,23 +16,20 @@
 
 package com.android.settings.gestures;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PickupGestureSettingsTest {
 
     private PickupGestureSettings mSettings;
@@ -45,12 +42,10 @@ public class PickupGestureSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                PickupGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+            PickupGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
     }
-
 }

tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java

@@ -26,7 +26,6 @@ import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
 import android.provider.Settings;
 
-import com.android.settings.TestConfig;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -37,11 +36,8 @@ import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SwipeToNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -101,7 +97,7 @@ public class SwipeToNotificationPreferenceControllerTest {
         stubFingerprintSupported(true);
         when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         // Set the setting to be enabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
         mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
 
@@ -113,7 +109,7 @@ public class SwipeToNotificationPreferenceControllerTest {
         stubFingerprintSupported(true);
         when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         // Set the setting to be disabled.
-        final Context context = ShadowApplication.getInstance().getApplicationContext();
+        final Context context = RuntimeEnvironment.application;
         Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
         mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
 

tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java

@@ -22,7 +22,6 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -31,13 +30,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SwipeToNotificationSettingsTest {
 
     @Mock
@@ -67,9 +64,8 @@ public class SwipeToNotificationSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        ShadowApplication.getInstance().getApplicationContext(),
-                        true /* enabled */);
+            SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());