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/widget/ActionBarShadowControllerTest.java

@@ -21,7 +21,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -33,7 +33,6 @@ import android.view.View;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -41,9 +40,10 @@ 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 ActionBarShadowControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java

@@ -25,14 +25,14 @@ import android.view.View;
 import androidx.preference.PreferenceViewHolder;
 
 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.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppCheckBoxPreferenceTest {
 
     private static final String SUMMARY = "summary info";

tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java

@@ -24,14 +24,14 @@ import android.view.View;
 import androidx.preference.PreferenceViewHolder;
 
 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.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AppSwitchPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java

@@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.view.View;
 
-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.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AspectRatioFrameLayoutTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java

@@ -23,14 +23,14 @@ import android.widget.LinearLayout;
 import android.widget.Space;
 
 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.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class BottomLabelLayoutTest {
 
     private BottomLabelLayout mBottomLabelLayout;

tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java

@@ -16,17 +16,16 @@
 
 package com.android.settings.widget;
 
-import static junit.framework.Assert.assertEquals;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static org.junit.Assert.assertEquals;
 
 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;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class DefaultIndicatorSeekBarTest {
 
     private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;

tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java

@@ -18,7 +18,7 @@ package com.android.settings.widget;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -33,14 +33,13 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 import androidx.preference.R;
 
-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 DisabledCheckBoxPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/DonutViewTest.java

@@ -2,13 +2,12 @@ package com.android.settings.widget;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 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 DonutViewTest {
     @Test
     public void getPercentageStringSpannable_doesntCrashForMissingPercentage() {

tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java

@@ -18,9 +18,9 @@ package com.android.settings.widget;
 
 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.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -46,8 +46,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.ShadowIconDrawableFactory;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.widget.LayoutPreference;
 
@@ -57,10 +55,10 @@ 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)
+@RunWith(RobolectricTestRunner.class)
 public class EntityHeaderControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -260,7 +258,6 @@ public class EntityHeaderControllerTest {
     }
 
     @Test
-    @Config(shadows = ShadowIconDrawableFactory.class)
     public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() {
         final View view = mLayoutInflater
                 .inflate(R.layout.settings_entity_header, null /* root */);
@@ -270,9 +267,7 @@ public class EntityHeaderControllerTest {
         mController.setIcon(entry).done(mActivity);
         final ImageView iconView = view.findViewById(R.id.entity_header_icon);
 
-        // Icon is set
-        assertThat(iconView.getDrawable()).isNotNull();
-        // ... and entry.icon is still empty. This means the icon didn't come from cache.
+        // ... entry.icon is still empty. This means the icon didn't come from cache.
         assertThat(entry.icon).isNull();
     }
 

tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java

@@ -27,16 +27,15 @@ import android.widget.TextView;
 
 import androidx.preference.PreferenceViewHolder;
 
-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 FixedLineSummaryPreferenceTest {
 
     @Mock

tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java

@@ -23,7 +23,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import com.google.android.material.appbar.AppBarLayout;
 
@@ -31,9 +30,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FloatingAppBarScrollingViewBehaviorTest {
 
     private FloatingAppBarScrollingViewBehavior mScrollingViewBehavior;

tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java

@@ -40,17 +40,17 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
-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.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class HighlightablePreferenceGroupAdapterTest {
 
     private static final String TEST_KEY = "key";

tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java

@@ -18,8 +18,8 @@ package com.android.settings.widget;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -27,15 +27,14 @@ import android.content.Context;
 import android.os.Handler;
 import android.view.View;
 
-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.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class LoadingViewControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java

@@ -31,14 +31,14 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceViewHolder;
 
 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.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class MasterCheckBoxPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java

@@ -31,15 +31,15 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 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 MasterSwitchPreferenceTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java

@@ -23,18 +23,18 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.junit.Before;
 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 PreferenceCategoryControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java

@@ -31,7 +31,6 @@ import android.os.UserManager;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.DefaultAppInfo;
 
 import org.junit.Before;
@@ -42,15 +41,15 @@ import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RadioButtonPickerFragmentTest {
 
-
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
     @Mock

tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java

@@ -18,7 +18,7 @@ package com.android.settings.widget;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -30,14 +30,14 @@ import android.view.View;
 import androidx.preference.PreferenceViewHolder;
 
 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.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RadioButtonPreferenceTest {
 
     private Application mContext;

tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java

@@ -16,21 +16,19 @@
 
 package com.android.settings.widget;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import android.content.Context;
 import android.view.View.MeasureSpec;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@org.robolectric.annotation.Config(shadows = SettingsShadowResourcesImpl.class)
+@RunWith(RobolectricTestRunner.class)
 public class RingProgressBarTest {
 
     private Context mContext = RuntimeEnvironment.application;
@@ -62,7 +60,7 @@ public class RingProgressBarTest {
 
     @Test
     public void testDefaultAttributes() {
-        assertEquals(false, mProgressBar.isIndeterminate());
+        assertFalse(mProgressBar.isIndeterminate());
         assertEquals(0, mProgressBar.getProgress());
         assertEquals(10000, mProgressBar.getMax());
     }

tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java

@@ -37,7 +37,6 @@ import android.graphics.drawable.ShapeDrawable;
 import android.os.Bundle;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.testutils.DrawableTestHelper;
@@ -45,9 +44,10 @@ import com.android.settingslib.testutils.DrawableTestHelper;
 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 RoundedHomepageIconTest {
 
     private Context mContext;
@@ -112,5 +112,4 @@ public class RoundedHomepageIconTest {
         assertThat(icon.mBackgroundColor)
                 .isEqualTo(mContext.getColor(R.color.material_blue_500));
     }
-
 }

tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java

@@ -25,16 +25,15 @@ import android.view.ViewGroup;
 
 import androidx.viewpager.widget.PagerAdapter;
 
-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 java.util.Locale;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class RtlCompatibleViewPagerTest {
 
     private Locale mLocaleEn;
@@ -81,7 +80,7 @@ public class RtlCompatibleViewPagerTest {
 
         private static final int ITEM_COUNT = 2;
 
-        public ViewPagerAdapter() {
+        private ViewPagerAdapter() {
         }
 
         @Override

tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java

@@ -18,9 +18,9 @@ package com.android.settings.widget;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -29,16 +29,15 @@ import static org.robolectric.RuntimeEnvironment.application;
 import android.graphics.Rect;
 import android.widget.FrameLayout;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowView;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ScrollToParentEditTextTest {
 
     private static final int EDIT_TEXT_SIZE = 20;

tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java

@@ -21,14 +21,13 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.os.Parcelable;
 
-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 SeekBarPreferenceTest {
 
     private static final int MAX = 75;

tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java

@@ -21,16 +21,15 @@ import static org.mockito.Mockito.verify;
 
 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.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SummaryUpdaterTest {
 
     private Context mContext;
@@ -112,7 +111,7 @@ public class SummaryUpdaterTest {
             return mTestSummary;
         }
 
-        public void setTestSummary(String summary) {
+        private void setTestSummary(String summary) {
             mTestSummary = summary;
         }
     }

tests/robotests/src/com/android/settings/widget/SwitchBarTest.java

@@ -25,16 +25,16 @@ import android.graphics.drawable.ColorDrawable;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class SwitchBarTest {
 
     private static final int COLOR_BACKGROUND = 1;

tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java

@@ -26,16 +26,16 @@ import android.view.View;
 import android.widget.Button;
 
 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;
 import org.robolectric.util.ReflectionHelpers;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class TwoStateButtonPreferenceTest {
 
     private TwoStateButtonPreference mPreference;

tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java

@@ -26,19 +26,19 @@ import android.widget.ArrayAdapter;
 import androidx.preference.ListPreference;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
 
 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.ArrayList;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowBluetoothUtils.class)
 public class UpdatableListPreferenceDialogFragmentTest {
 
@@ -78,15 +78,13 @@ public class UpdatableListPreferenceDialogFragmentTest {
 
     @Test
     public void onListPreferenceUpdated_verifyAdapterCanBeUpdate() {
-        assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).
-                isEqualTo(0);
+        assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(0);
 
         ListPreference listPreference = new ListPreference(mContext);
         final CharSequence[] charSequences = {"Test_DEVICE_1", "Test_DEVICE_2"};
         listPreference.setEntries(charSequences);
         mUpdatableListPrefDlgFragment.onListPreferenceUpdated(listPreference);
 
-        assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).
-                isEqualTo(2);
+        assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(2);
     }
 }

tests/robotests/src/com/android/settings/widget/UsageGraphTest.java

@@ -26,15 +26,15 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.util.SparseIntArray;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.R;
 
 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 UsageGraphTest {
 
     private UsageGraph mGraph;

tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java

@@ -18,8 +18,8 @@ package com.android.settings.widget;
 
 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.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -33,16 +33,15 @@ import android.widget.TextView;
 
 import androidx.preference.PreferenceViewHolder;
 
-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 ValidatedEditTextPreferenceTest {
 
     @Mock

tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java

@@ -73,5 +73,4 @@ public class VideoPreferenceControllerTest {
 
         verify(mPreference).onViewVisible(anyBoolean());
     }
-
 }

tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java

@@ -32,16 +32,16 @@ import android.view.TextureView;
 import androidx.preference.PreferenceViewHolder;
 
 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 VideoPreferenceTest {
     private static final int VIDEO_WIDTH = 100;
     private static final int VIDEO_HEIGHT = 150;