Use binary resource support in robolectric

The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b

tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java

@@ -26,7 +26,6 @@ import android.content.Context;
 import android.provider.Settings;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.Before;
@@ -34,10 +33,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowSecureSettings.class)
 public class AmbientDisplayAlwaysOnPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java

@@ -20,9 +20,9 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -35,7 +35,6 @@ import android.provider.Settings;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -44,11 +43,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowSecureSettings.class)
 public class AmbientDisplayNotificationsPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/display/AppGridViewTest.java

@@ -30,16 +30,15 @@ import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.util.IconDrawableFactory;
 
-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.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppGridViewTest {
 
     @Mock

tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java

@@ -27,15 +27,15 @@ import android.content.Context;
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AutoBrightnessPreferenceControllerTest {
 
     private static final String PREFERENCE_KEY = "auto_brightness";

tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java

@@ -18,8 +18,8 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
@@ -33,9 +33,7 @@ import androidx.preference.SwitchPreference;
 import com.android.internal.view.RotationPolicy;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowRotationPolicy;
-import com.android.settings.testutils.shadow.ShadowSystemSettings;
 
 import org.junit.After;
 import org.junit.Before;
@@ -44,11 +42,11 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowSystemSettings.class)
+@RunWith(RobolectricTestRunner.class)
 public class AutoRotatePreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -71,11 +69,6 @@ public class AutoRotatePreferenceControllerTest {
         mController = new AutoRotatePreferenceController(mContext, "auto_rotate");
     }
 
-    @After
-    public void tearDown() {
-        ShadowSystemSettings.reset();
-    }
-
     @Test
     public void isAvailableWhenPolicyAllows() {
         assertThat(mController.isAvailable()).isFalse();

tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java

@@ -23,14 +23,13 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class BatteryPercentagePreferenceControllerTest {
 
     private static final String PREF_KEY = "battery_percentage";

tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

@@ -20,7 +20,7 @@ import static android.content.Context.POWER_SERVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
@@ -35,19 +35,18 @@ import android.provider.Settings.System;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-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.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowContentResolver;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class BrightnessLevelPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java

@@ -28,16 +28,16 @@ import androidx.preference.Preference;
 
 import com.android.internal.app.ColorDisplayController;
 import com.android.settings.R;
-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.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ColorModePreferenceControllerTest {
 
     @Mock
@@ -99,5 +99,4 @@ public class ColorModePreferenceControllerTest {
         assertThat(mPreference.getSummary())
                 .isEqualTo(mContext.getText(R.string.color_mode_option_natural));
     }
-
 }

tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java

@@ -34,24 +34,25 @@ import androidx.preference.PreferenceScreen;
 import com.android.internal.app.ColorDisplayController;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.widget.CandidateInfo;
 import com.android.settingslib.widget.LayoutPreference;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class ColorModePreferenceFragmentTest {
 
@@ -71,6 +72,11 @@ public class ColorModePreferenceFragmentTest {
         ReflectionHelpers.setField(mFragment, "mController", mController);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void verifyMetricsConstant() {
         assertThat(mFragment.getMetricsCategory())

tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java

@@ -26,16 +26,15 @@ import android.content.Context;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceScreen;
 
-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.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DarkUIPreferenceControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java

@@ -23,14 +23,14 @@ import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FontSizePreferenceControllerTest {
 
     private static final String TEST_KEY = "test_key";
@@ -54,23 +54,20 @@ public class FontSizePreferenceControllerTest {
 
     @Test
     public void getSummary_noScale_shouldReturnDefaultSummary() {
-        assertThat(mController.getSummary())
-                .isEqualTo(mFontSizeArray[1]);
+        assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[1]);
     }
 
     @Test
     public void getSummary_smallScale_shouldReturnSmall() {
         Settings.System.putFloat(mContext.getContentResolver(),
                 Settings.System.FONT_SCALE, 0.5f);
-        assertThat(mController.getSummary())
-                .isEqualTo(mFontSizeArray[0]);
+        assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[0]);
     }
 
     @Test
     public void getSummary_largeScale_shouldReturnLarge() {
         Settings.System.putFloat(mContext.getContentResolver(),
                 Settings.System.FONT_SCALE, 1.5f);
-        assertThat(mController.getSummary())
-                .isEqualTo(mFontSizeArray[3]);
+        assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[3]);
     }
 }

tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java

@@ -16,7 +16,7 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -26,19 +26,20 @@ import android.view.View;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.widget.LayoutPreference;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayActivationPreferenceControllerTest {
 
@@ -59,6 +60,11 @@ public class NightDisplayActivationPreferenceControllerTest {
         mController.displayPreference(mScreen);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable() {
         SettingsShadowResources.overrideResource(

tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java

@@ -20,16 +20,17 @@ import android.content.Context;
 import android.provider.Settings.Secure;
 
 import com.android.internal.app.ColorDisplayController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayAutoModePreferenceControllerTest {
 
@@ -43,6 +44,11 @@ public class NightDisplayAutoModePreferenceControllerTest {
             "night_display_auto_mode");
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable() {
         SettingsShadowResources.overrideResource(

tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java

@@ -16,16 +16,17 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayCustomEndTimePreferenceControllerTest {
 
@@ -37,6 +38,11 @@ public class NightDisplayCustomEndTimePreferenceControllerTest {
                 RuntimeEnvironment.application, "night_display_end_time");
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable() {
         SettingsShadowResources.overrideResource(

tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java

@@ -16,16 +16,17 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayCustomStartTimePreferenceControllerTest {
 
@@ -37,6 +38,11 @@ public class NightDisplayCustomStartTimePreferenceControllerTest {
                 RuntimeEnvironment.application, "night_display_start_time");
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable() {
         SettingsShadowResources.overrideResource(

tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java

@@ -16,16 +16,17 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayFooterPreferenceControllerTest {
 
@@ -36,6 +37,11 @@ public class NightDisplayFooterPreferenceControllerTest {
         mController = new NightDisplayFooterPreferenceController(RuntimeEnvironment.application);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable() {
         SettingsShadowResources.overrideResource(
@@ -49,5 +55,4 @@ public class NightDisplayFooterPreferenceControllerTest {
                 com.android.internal.R.bool.config_nightDisplayAvailable, false);
         assertThat(mController.isAvailable()).isFalse();
     }
-
 }

tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java

@@ -19,16 +19,17 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.provider.Settings.Secure;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class NightDisplayIntensityPreferenceControllerTest {
 
@@ -42,6 +43,11 @@ public class NightDisplayIntensityPreferenceControllerTest {
             "night_display_temperature");
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void isAvailable_configuredAvailable_isActivated_available() {
         SettingsShadowResources.overrideResource(

tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java

@@ -7,19 +7,17 @@ import android.provider.Settings.Secure;
 
 import com.android.internal.app.ColorDisplayController;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {
-        SettingsShadowResources.class
-})
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
 public class NightDisplayPreferenceControllerTest {
 
   @After

tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java

@@ -20,17 +20,17 @@ import static com.google.common.truth.Truth.assertThat;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class NightDisplaySettingsTest {
 
     @Test

tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java

@@ -23,15 +23,14 @@ import static org.mockito.Mockito.spy;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ScreenZoomSettingsTest {
 
     private ScreenZoomSettings mSettings;

tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java

@@ -26,7 +26,6 @@ import android.provider.Settings;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,8 +33,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ShowOperatorNamePreferenceControllerTest {
 
     private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name";

tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java

@@ -18,9 +18,9 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -38,7 +38,6 @@ import androidx.preference.ListPreference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,11 +45,12 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.Arrays;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ThemePreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java

@@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application;
 
 import android.util.AttributeSet;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -31,10 +30,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowUserManager.class)
 public class TimeoutListPreferenceTest {
     private static final CharSequence[] VALUES =
@@ -49,7 +50,10 @@ public class TimeoutListPreferenceTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mPreference = new TimeoutListPreference(application, mock(AttributeSet.class));
+
+        AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+
+        mPreference = new TimeoutListPreference(application, attributeSet);
         ReflectionHelpers.setField(mPreference, "mInitialValues", VALUES);
         ReflectionHelpers.setField(mPreference, "mInitialEntries", ENTRIES);
         ReflectionHelpers.setField(mPreference, "mEntries", ENTRIES);

tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java

@@ -32,7 +32,6 @@ import android.os.UserManager;
 import android.provider.Settings;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -44,6 +43,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowDevicePolicyManager.class)
 public class TimeoutPreferenceControllerTest {
 
@@ -134,7 +134,7 @@ public class TimeoutPreferenceControllerTest {
 
         verify(mPreference, times(2))
                 .removeUnusableTimeouts(longCaptor.capture(), adminCaptor.capture());
-        assertThat((long) longCaptor.getValue()).isEqualTo(0);
+        assertThat(longCaptor.getValue()).isEqualTo(0);
         assertThat(adminCaptor.getValue()).isNotNull();
     }
 

tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java

@@ -31,7 +31,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -41,8 +40,9 @@ import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class TopLevelDisplayPreferenceControllerTest {
     @Mock
     private Context mContext;
@@ -55,10 +55,8 @@ public class TopLevelDisplayPreferenceControllerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getString(R.string.config_wallpaper_picker_package))
-                .thenReturn("pkg");
-        when(mContext.getString(R.string.config_wallpaper_picker_class))
-                .thenReturn("cls");
+        when(mContext.getString(R.string.config_wallpaper_picker_package)).thenReturn("pkg");
+        when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls");
 
         mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
     }
@@ -88,5 +86,4 @@ public class TopLevelDisplayPreferenceControllerTest {
         assertThat(mController.getSummary())
                 .isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary));
     }
-
 }

tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java

@@ -26,19 +26,19 @@ import android.os.UserHandle;
 import android.provider.Settings;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class VrDisplayPreferencePickerTest {
 
     private VrDisplayPreferencePicker mPicker;

tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java

@@ -18,8 +18,8 @@ package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -29,7 +29,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,8 +38,9 @@ import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.robolectric.RobolectricTestRunner;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class WallpaperPreferenceControllerTest {
 
     private static final String WALLPAPER_PACKAGE = "TestPkg";