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/wifi/AppStateChangeWifiStateBridgeTest.java

@@ -16,14 +16,8 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import android.app.AppOpsManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
@@ -32,25 +26,19 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AppStateChangeWifiStateBridgeTest {
 
     @Mock
     private AppEntry mEntry;
     @Mock
     private AppStateChangeWifiStateBridge.WifiSettingsState mState;
-    private Context mContext;
     private AppFilter mFilter;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
         mFilter = AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE;
     }
 

tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java

@@ -16,11 +16,12 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
-import android.net.wifi.WifiManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -28,19 +29,12 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class CellularFallbackPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-    @Mock
-    private WifiManager mWifiManager;
 
     private CellularFallbackPreferenceController mController;
 

tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java

@@ -25,30 +25,24 @@ import android.content.Context;
 
 import com.android.internal.logging.nano.MetricsProto;
 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.settingslib.applications.ApplicationsState.AppEntry;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ChangeWifiStateDetailsTest {
+
     private static final String PACKAGE_NAME = "app";
     private FakeFeatureFactory mFeatureFactory;
     private ChangeWifiStateDetails mFragment;
     private Context mContext;
 
-    @Mock
-    private AppEntry mAppEntry;
     @Mock
     private AppStateChangeWifiStateBridge.WifiSettingsState mState;
 
@@ -80,14 +74,14 @@ public class ChangeWifiStateDetailsTest {
     @Test
     public void testGetSummary_permissibleTrue_returnAllowed() {
         when(mState.isPermissible()).thenReturn(true);
-        assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
-                mContext.getString(R.string.app_permission_summary_allowed));
+        assertThat(ChangeWifiStateDetails.getSummary(mContext, mState))
+            .isEqualTo(mContext.getString(R.string.app_permission_summary_allowed));
     }
 
     @Test
     public void testGetSummary_permissibleFalse_returnNotAllowed() {
         when(mState.isPermissible()).thenReturn(false);
-        assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
-                mContext.getString(R.string.app_permission_summary_not_allowed));
+        assertThat(ChangeWifiStateDetails.getSummary(mContext, mState))
+            .isEqualTo(mContext.getString(R.string.app_permission_summary_not_allowed));
     }
 }

tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java

@@ -1,7 +1,6 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -10,7 +9,7 @@ import static org.mockito.Mockito.when;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import com.android.settings.TestConfig;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 
@@ -23,7 +22,6 @@ import org.robolectric.annotation.Config;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConfigureWifiSettingsTest {
 
     private Context mContext;
@@ -35,8 +33,8 @@ public class ConfigureWifiSettingsTest {
 
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+        final List<String> niks =
+            ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
         final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
@@ -47,11 +45,12 @@ public class ConfigureWifiSettingsTest {
     @Test
     @Config(qualifiers = "mcc999")
     public void testNonIndexableKeys_ifPageDisabled_shouldNotIndexResource() {
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+        final List<String> niks =
+            ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
         final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
+        assertThat(keys).isNotNull();
         assertThat(niks).containsAllIn(keys);
     }
 
@@ -61,8 +60,8 @@ public class ConfigureWifiSettingsTest {
         when(manager.getActiveNetworkInfo()).thenReturn(null);
         doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+        final List<String> niks =
+            ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
         assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
     }
 
@@ -74,8 +73,8 @@ public class ConfigureWifiSettingsTest {
         when(manager.getActiveNetworkInfo()).thenReturn(info);
         doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+        final List<String> niks =
+            ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
         assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
     }
 
@@ -87,8 +86,8 @@ public class ConfigureWifiSettingsTest {
         when(manager.getActiveNetworkInfo()).thenReturn(info);
         doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
 
-        final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getNonIndexableKeys(mContext);
+        final List<String> niks =
+            ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
         assertThat(niks).doesNotContain(ConfigureWifiSettings.KEY_IP_ADDRESS);
     }
 }

tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java

@@ -17,16 +17,14 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.wifi.AccessPoint;
 
@@ -36,11 +34,10 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConnectedAccessPointPreferenceTest {
+
     @Mock
     private AccessPoint mAccessPoint;
     @Mock
@@ -50,7 +47,6 @@ public class ConnectedAccessPointPreferenceTest {
     private Context mContext;
     private ConnectedAccessPointPreference mConnectedAccessPointPreference;
 
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
@@ -63,7 +59,7 @@ public class ConnectedAccessPointPreferenceTest {
 
     @Test
     public void testOnClick_gearClicked_listenerInvoked() {
-        doReturn(R.id.settings_button).when(mView).getId();
+        when(mView.getId()).thenReturn(R.id.settings_button);
 
         mConnectedAccessPointPreference.onClick(mView);
 
@@ -79,7 +75,7 @@ public class ConnectedAccessPointPreferenceTest {
 
     @Test
     public void testWidgetLayoutPreference() {
-        assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource()).isEqualTo(
-                R.layout.preference_widget_gear_no_bg);
+        assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource())
+            .isEqualTo(R.layout.preference_widget_gear_no_bg);
     }
 }

tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java

@@ -28,17 +28,14 @@ import android.widget.TextView;
 import com.android.settings.LinkifyUtils;
 import com.android.settings.R;
 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.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 LinkablePreferenceTest {
 
     private static final String TITLE = "Title";
@@ -54,14 +51,13 @@ public class LinkablePreferenceTest {
         MockitoAnnotations.initMocks(this);
 
         mPreference = new LinkablePreference(mContext);
-        final CharSequence linkableDescription =
-                mContext.getResources().getText(R.string.wifi_scan_notify_text);
+        final CharSequence linkableDescription = mContext.getText(R.string.wifi_scan_notify_text);
         final LinkifyUtils.OnClickListener clickListener = () -> {/* Do nothing */ };
         mPreference.setText(TITLE, linkableDescription, clickListener);
 
         LayoutInflater inflater = LayoutInflater.from(mContext);
-        mView = inflater.inflate(
-                mPreference.getLayoutResource(), new LinearLayout(mContext), false);
+        mView =
+            inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
         mHolder = PreferenceViewHolder.createInstanceForTests(mView);
 
         mPreference.onBindViewHolder(mHolder);
@@ -70,6 +66,7 @@ public class LinkablePreferenceTest {
     @Test
     public void prefWithLinkShouldHaveAccessibilityMovementMethodSet() {
         TextView textView = mView.findViewById(android.R.id.title);
+        assertThat(textView).isNotNull();
         assertThat(textView.getMovementMethod()).isNotNull();
     }
 }

tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java

@@ -17,9 +17,7 @@
 package com.android.settings.wifi;
 
 import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -29,7 +27,6 @@ import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -37,10 +34,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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 NotifyOpenNetworkPreferenceControllerTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java

@@ -16,27 +16,28 @@
 
 package com.android.settings.wifi;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager.ActionListener;
 import android.os.Handler;
-import com.android.settings.TestConfig;
+
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wrapper.WifiManagerWrapper;
 import com.android.settingslib.wifi.AccessPoint;
+
 import org.junit.Before;
 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.util.ReflectionHelpers;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedAccessPointsWifiSettingsTest {
 
     @Mock private WifiManagerWrapper mockWifiManager;
@@ -67,21 +68,21 @@ public class SavedAccessPointsWifiSettingsTest {
 
         mSettings.onForget(null);
 
-        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+        verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
     }
 
     @Test
     public void onForget_onSuccess_shouldSendMessageToHandler() {
         mSettings.mForgetListener.onSuccess();
 
-        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+        verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
     }
 
     @Test
     public void onForget_onFailure_shouldSendMessageToHandler() {
         mSettings.mForgetListener.onFailure(0);
 
-        verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+        verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
     }
 
     @Test
@@ -89,12 +90,13 @@ public class SavedAccessPointsWifiSettingsTest {
         mSettings.onSubmit(mockWifiDialog);
         verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
     }
+
     @Test
     public void onForget_shouldInvokeForgetApi() {
         ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mockAccessPoint);
         when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
         mSettings.onForget(mockWifiDialog);
-        verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+        verify(mockWifiManager)
+            .forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
     }
 }
-

tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java

@@ -37,12 +37,11 @@ import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-
 import com.google.common.collect.Lists;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -52,14 +51,13 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UseOpenWifiPreferenceControllerTest {
+
     private static ComponentName sEnableActivityComponent;
     private static NetworkScorerAppData sAppData;
     private static NetworkScorerAppData sAppDataNoActivity;
@@ -71,10 +69,14 @@ public class UseOpenWifiPreferenceControllerTest {
         sAppDataNoActivity = new NetworkScorerAppData(0, null, null, null, null);
     }
 
-    @Mock private Lifecycle mLifecycle;
-    @Mock private Fragment mFragment;
-    @Mock private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
-    @Captor private ArgumentCaptor<Intent> mIntentCaptor;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private Fragment mFragment;
+    @Mock
+    private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+    @Captor
+    private ArgumentCaptor<Intent> mIntentCaptor;
     private Context mContext;
     private UseOpenWifiPreferenceController mController;
 
@@ -96,8 +98,8 @@ public class UseOpenWifiPreferenceControllerTest {
      *                First scorer in the list is the active scorer.
      */
     private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
-        when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
-                sEnableActivityComponent.getPackageName());
+        when(mNetworkScoreManagerWrapper.getActiveScorerPackage())
+            .thenReturn(sEnableActivityComponent.getPackageName());
         when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
         when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
     }

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

@@ -16,6 +16,14 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,7 +33,6 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
 import com.android.settingslib.wifi.AccessPoint;
 
@@ -37,12 +44,8 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.*;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowConnectivityManager.class)
+@Config(shadows = ShadowConnectivityManager.class)
 public class WifiConfigControllerTest {
 
     @Mock
@@ -85,6 +88,7 @@ public class WifiConfigControllerTest {
         mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
                 WifiConfigUiBase.MODE_CONNECT);
         final TextView ssid = mView.findViewById(R.id.ssid);
+        assertThat(ssid).isNotNull();
         ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
         mController.showWarningMessagesIfAppropriate();
 
@@ -98,6 +102,7 @@ public class WifiConfigControllerTest {
                 WifiConfigUiBase.MODE_CONNECT);
 
         final TextView ssid = mView.findViewById(R.id.ssid);
+        assertThat(ssid).isNotNull();
         ssid.setText("123456789012345678901234567890");
         mController.showWarningMessagesIfAppropriate();
 
@@ -114,6 +119,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_noSSID_shouldReturnFalse() {
         final TextView ssid = mView.findViewById(R.id.ssid);
+        assertThat(ssid).isNotNull();
         ssid.setText("");
         assertThat(mController.isSubmittable()).isFalse();
     }
@@ -121,6 +127,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_longPsk_shouldReturnFalse() {
         final TextView password = mView.findViewById(R.id.password);
+        assertThat(password).isNotNull();
         password.setText(LONG_PSK);
         assertThat(mController.isSubmittable()).isFalse();
 
@@ -129,6 +136,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_shortPsk_shouldReturnFalse() {
         final TextView password = mView.findViewById(R.id.password);
+        assertThat(password).isNotNull();
         password.setText(SHORT_PSK);
         assertThat(mController.isSubmittable()).isFalse();
     }
@@ -136,6 +144,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_goodPsk_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
+        assertThat(password).isNotNull();
         password.setText(GOOD_PSK);
         assertThat(mController.isSubmittable()).isTrue();
 
@@ -144,6 +153,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_hexPsk_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
+        assertThat(password).isNotNull();
         password.setText(HEX_PSK);
         assertThat(mController.isSubmittable()).isTrue();
 
@@ -152,6 +162,7 @@ public class WifiConfigControllerTest {
     @Test
     public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
         final TextView password = mView.findViewById(R.id.password);
+        assertThat(password).isNotNull();
         password.setText("");
         when(mAccessPoint.isSaved()).thenReturn(true);
         assertThat(mController.isSubmittable()).isTrue();
@@ -159,8 +170,8 @@ public class WifiConfigControllerTest {
 
     @Test
     public void isSubmittable_nullAccessPoint_noException() {
-        mController = new TestWifiConfigController(mConfigUiBase, mView, null,
-                WifiConfigUiBase.MODE_CONNECT);
+        mController =
+            new TestWifiConfigController(mConfigUiBase, mView, null, WifiConfigUiBase.MODE_CONNECT);
         mController.isSubmittable();
     }
 
@@ -201,8 +212,8 @@ public class WifiConfigControllerTest {
 
     public class TestWifiConfigController extends WifiConfigController {
 
-        public TestWifiConfigController(WifiConfigUiBase parent, View view,
-                AccessPoint accessPoint, int mode) {
+        private TestWifiConfigController(
+            WifiConfigUiBase parent, View view, AccessPoint accessPoint, int mode) {
             super(parent, view, accessPoint, mode);
         }
 

tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java

@@ -17,13 +17,11 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.doReturn;
 
 import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -40,19 +38,15 @@ import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-                ShadowConnectivityManager.class,
-                ShadowWifiManager.class
-        }
+@Config(shadows = {
+    SettingsShadowResources.SettingsShadowTheme.class,
+    ShadowConnectivityManager.class,
+    ShadowWifiManager.class
+}
 )
 public class WifiDialogActivityTest {
 
-    public static final String AP1_SSID = "\"ap1\"";
+    private static final String AP1_SSID = "\"ap1\"";
     @Mock
     private WifiConfigController mController;
 

tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java

@@ -5,12 +5,11 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-
 import com.android.settings.wifi.WifiDialog.WifiDialogListener;
 import com.android.settingslib.wifi.AccessPoint;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,10 +18,8 @@ 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 = ShadowEntityHeaderController.class)
+@Config(shadows = ShadowEntityHeaderController.class)
 public class WifiDialogTest {
     @Mock private AccessPoint mockAccessPoint;
 

tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java

@@ -16,12 +16,15 @@
 
 package com.android.settings.wifi;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settings.wrapper.ConnectivityManagerWrapper;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -31,14 +34,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiEnablerTest {
 
     @Mock
@@ -67,5 +64,4 @@ public class WifiEnablerTest {
 
         verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
     }
-
 }

tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java

@@ -18,9 +18,7 @@ package com.android.settings.wifi;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
@@ -34,7 +32,6 @@ import android.net.wifi.WifiManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -44,10 +41,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiInfoPreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java

@@ -29,7 +29,6 @@ import android.net.wifi.WifiManager;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.MasterSwitchPreference;
@@ -44,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 WifiMasterSwitchPreferenceControllerTest {
 
     @Mock
@@ -56,14 +54,12 @@ public class WifiMasterSwitchPreferenceControllerTest {
 
     private Context mContext;
     private WifiMasterSwitchPreferenceController mController;
-    private FakeFeatureFactory mFakeFeatureFactory;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
+        mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);

tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java

@@ -16,12 +16,10 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.spy;
 
 import android.content.Context;
 
-import com.android.settings.TestConfig;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -35,7 +33,6 @@ import org.robolectric.annotation.Config;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiSettingsTest {
 
     private Context mContext;
@@ -49,8 +46,7 @@ public class WifiSettingsTest {
     @Test
     public void testSearchIndexProvider_shouldIndexFragmentTitle() {
         final List<SearchIndexableRaw> indexRes =
-                WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
-                        true /* enabled */);
+            WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE);
@@ -60,8 +56,7 @@ public class WifiSettingsTest {
     @Config(qualifiers = "mcc999")
     public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() {
         final List<SearchIndexableRaw> indexRes =
-                WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
-                        true /* enabled */);
+            WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
 
         assertThat(indexRes).isEmpty();
     }

tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java

@@ -16,6 +16,12 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -24,7 +30,6 @@ import android.net.wifi.WifiManager;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
 import com.android.settingslib.wifi.WifiStatusTracker;
 
@@ -35,16 +40,8 @@ import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiSummaryUpdaterTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -102,8 +99,8 @@ public class WifiSummaryUpdaterTest {
     public void getSummary_wifiDisabled_shouldReturnDisabled() {
         mWifiTracker.enabled = false;
 
-        assertThat(mSummaryUpdater.getSummary()).isEqualTo(
-            mContext.getString(R.string.switch_off_text));
+        assertThat(mSummaryUpdater.getSummary())
+            .isEqualTo(mContext.getString(R.string.switch_off_text));
     }
 
     @Test
@@ -111,8 +108,8 @@ public class WifiSummaryUpdaterTest {
         mWifiTracker.enabled = true;
         mWifiTracker.connected = false;
 
-        assertThat(mSummaryUpdater.getSummary()).isEqualTo(
-            mContext.getString(R.string.disconnected));
+        assertThat(mSummaryUpdater.getSummary())
+            .isEqualTo(mContext.getString(R.string.disconnected));
     }
 
     @Test
@@ -132,5 +129,4 @@ public class WifiSummaryUpdaterTest {
             this.summary = summary;
         }
     }
-
 }

tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java

@@ -16,18 +16,14 @@
 
 package com.android.settings.wifi;
 
+import static com.google.common.truth.Truth.assertThat;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiUtilsTest {
 
     @Test
@@ -48,5 +44,4 @@ public class WifiUtilsTest {
         assertThat(WifiUtils.isPasswordValid("1234567890")).isTrue();
         assertThat(WifiUtils.isPasswordValid(longPassword)).isFalse();
     }
-
 }

tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java

@@ -29,7 +29,6 @@ import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.After;
@@ -38,17 +37,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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 WifiWakeupPreferenceControllerTest {
 
-    private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
-
     private Context mContext;
     private WifiWakeupPreferenceController mController;
 

tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.wifi;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
@@ -25,7 +24,6 @@ import android.content.Context;
 import android.view.inputmethod.InputMethodManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 import com.android.settings.wrapper.WifiManagerWrapper;
 
@@ -40,14 +38,13 @@ import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(
-        manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = ShadowNfcAdapter.class
-)
+@Config(shadows = ShadowNfcAdapter.class)
 public class WriteWifiConfigToNfcDialogTest {
-    @Mock Activity mActivity;
-    @Mock WifiManagerWrapper mWifiManager;
+
+    @Mock
+    Activity mActivity;
+    @Mock
+    WifiManagerWrapper mWifiManager;
 
     private WriteWifiConfigToNfcDialog mWriteWifiConfigToNfcDialog;
 

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

@@ -16,14 +16,11 @@
 package com.android.settings.wifi.details;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -63,7 +60,6 @@ import android.widget.ImageView;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBidiFormatter;
@@ -99,13 +95,12 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowDevicePolicyManagerWrapper.class,
-                ShadowEntityHeaderController.class,
-                ShadowPackageManagerWrapper.class,
-                ShadowBidiFormatter.class
-        })
+@Config(shadows = {
+    ShadowDevicePolicyManagerWrapper.class,
+    ShadowEntityHeaderController.class,
+    ShadowPackageManagerWrapper.class,
+    ShadowBidiFormatter.class
+})
 public class WifiDetailPreferenceControllerTest {
 
     private static final int LEVEL = 1;
@@ -117,41 +112,69 @@ public class WifiDetailPreferenceControllerTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private PreferenceScreen mockScreen;
 
-    @Mock private AccessPoint mockAccessPoint;
-    @Mock private Activity mockActivity;
-    @Mock private ConnectivityManager mockConnectivityManager;
-    @Mock private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
-    @Mock private Network mockNetwork;
-    @Mock private NetworkInfo mockNetworkInfo;
-    @Mock private WifiConfiguration mockWifiConfig;
-    @Mock private WifiInfo mockWifiInfo;
-    @Mock private WifiNetworkDetailsFragment mockFragment;
-    @Mock private WifiManager mockWifiManager;
-    @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
-    @Mock private WifiDetailPreferenceController.IconInjector mockIconInjector;
+    @Mock
+    private AccessPoint mockAccessPoint;
+    @Mock
+    private Activity mockActivity;
+    @Mock
+    private ConnectivityManager mockConnectivityManager;
+    @Mock
+    private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
+    @Mock
+    private Network mockNetwork;
+    @Mock
+    private NetworkInfo mockNetworkInfo;
+    @Mock
+    private WifiConfiguration mockWifiConfig;
+    @Mock
+    private WifiInfo mockWifiInfo;
+    @Mock
+    private WifiNetworkDetailsFragment mockFragment;
+    @Mock
+    private WifiManager mockWifiManager;
+    @Mock
+    private MetricsFeatureProvider mockMetricsFeatureProvider;
+    @Mock
+    private WifiDetailPreferenceController.IconInjector mockIconInjector;
 
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private EntityHeaderController mockHeaderController;
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private LayoutPreference mockHeaderLayoutPreference;
-    @Mock private ImageView mockHeaderIcon;
+    @Mock
+    private ImageView mockHeaderIcon;
 
-    @Mock private ActionButtonPreference mockButtonsPref;
-    @Mock private WifiDetailPreference mockSignalStrengthPref;
-    @Mock private WifiDetailPreference mockLinkSpeedPref;
-    @Mock private WifiDetailPreference mockFrequencyPref;
-    @Mock private WifiDetailPreference mockSecurityPref;
-    @Mock private WifiDetailPreference mockMacAddressPref;
-    @Mock private WifiDetailPreference mockIpAddressPref;
-    @Mock private WifiDetailPreference mockGatewayPref;
-    @Mock private WifiDetailPreference mockSubnetPref;
-    @Mock private WifiDetailPreference mockDnsPref;
-    @Mock private PreferenceCategory mockIpv6Category;
-    @Mock private WifiDetailPreference mockIpv6AddressesPref;
+    @Mock
+    private ActionButtonPreference mockButtonsPref;
+    @Mock
+    private WifiDetailPreference mockSignalStrengthPref;
+    @Mock
+    private WifiDetailPreference mockLinkSpeedPref;
+    @Mock
+    private WifiDetailPreference mockFrequencyPref;
+    @Mock
+    private WifiDetailPreference mockSecurityPref;
+    @Mock
+    private WifiDetailPreference mockMacAddressPref;
+    @Mock
+    private WifiDetailPreference mockIpAddressPref;
+    @Mock
+    private WifiDetailPreference mockGatewayPref;
+    @Mock
+    private WifiDetailPreference mockSubnetPref;
+    @Mock
+    private WifiDetailPreference mockDnsPref;
+    @Mock
+    private PreferenceCategory mockIpv6Category;
+    @Mock
+    private WifiDetailPreference mockIpv6AddressesPref;
 
-    @Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
-    @Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
-    @Captor private ArgumentCaptor<Preference> mIpv6AddressCaptor;
+    @Captor
+    private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
+    @Captor
+    private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
+    @Captor
+    private ArgumentCaptor<Preference> mIpv6AddressCaptor;
 
     private Context mContext;
     private Lifecycle mLifecycle;
@@ -348,8 +371,8 @@ public class WifiDetailPreferenceControllerTest {
         displayAndResume();
         mController.onPause();
 
-        verify(mockConnectivityManager, times(1)).unregisterNetworkCallback(
-                mCallbackCaptor.getValue());
+        verify(mockConnectivityManager, times(1))
+            .unregisterNetworkCallback(mCallbackCaptor.getValue());
     }
 
     @Test
@@ -472,8 +495,7 @@ public class WifiDetailPreferenceControllerTest {
     @Test
     public void noLinkProperties_allIpDetailsHidden() {
         when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
-                mockDnsPref);
+        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
 
         displayAndResume();
 

tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java

@@ -16,7 +16,6 @@
 package com.android.settings.wifi.details;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
@@ -25,7 +24,6 @@ import android.net.wifi.WifiConfiguration;
 import android.support.v7.preference.DropDownPreference;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -33,14 +31,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiMeteredPreferenceControllerTest {
-    public static final int METERED_OVERRIDE_NONE = 0;
-    public static final int METERED_OVERRIDE_METERED = 1;
-    public static final int METERED_OVERRIDE_NOT_METERED = 2;
+
+    private static final int METERED_OVERRIDE_NONE = 0;
+    private static final int METERED_OVERRIDE_METERED = 1;
+    private static final int METERED_OVERRIDE_NOT_METERED = 2;
 
     @Mock
     private WifiConfiguration mWifiConfiguration;

tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java

@@ -27,7 +27,6 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -36,10 +35,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class P2pCategoryPreferenceControllerTest {
 
     @Mock
@@ -54,7 +51,6 @@ public class P2pCategoryPreferenceControllerTest {
         when(mPreferenceScreen.findPreference(anyString())).thenReturn(mCategory);
 
         mController = new P2pCategoryPreferenceController(RuntimeEnvironment.application) {
-
             @Override
             public String getPreferenceKey() {
                 return "test_key";
@@ -68,7 +64,6 @@ public class P2pCategoryPreferenceControllerTest {
         assertThat(mController.isAvailable()).isTrue();
     }
 
-
     @Test
     public void removeAllChildren_shouldRemove() {
         mController.removeAllChildren();

tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java

@@ -16,13 +16,15 @@
 
 package com.android.settings.wifi.p2p;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
 
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,14 +32,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class P2pThisDevicePreferenceControllerTest {
 
     @Mock

tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java

@@ -17,9 +17,7 @@ package com.android.settings.wifi.p2p;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.times;
@@ -35,7 +33,6 @@ import android.net.wifi.WifiManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -45,10 +42,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiP2PPreferenceControllerTest {
 
     @Mock
@@ -69,10 +64,8 @@ public class WifiP2PPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(WifiManager.class))
-                .thenReturn(mWifiManager);
-        when(mScreen.findPreference(anyString()))
-                .thenReturn(mWifiDirectPreference);
+        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+        when(mScreen.findPreference(anyString())).thenReturn(mWifiDirectPreference);
         mController = new WifiP2pPreferenceController(mContext, mLifecycle, mWifiManager);
     }
 

tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java

@@ -25,39 +25,36 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.wifi.WifiManager;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
-import java.util.ArrayList;
 import org.junit.Before;
 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.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowApplication.Wrapper;
 import org.robolectric.util.ReflectionHelpers;
 
+import java.util.ArrayList;
+
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class TetherServiceTest {
 
     @Mock
     private Context mContext;
 
-    private ShadowApplication mShadowApplication;
     private Context mAppContext;
     private TetherService mService;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mShadowApplication = ShadowApplication.getInstance();
-        mAppContext = mShadowApplication.getApplicationContext();
+        mAppContext = RuntimeEnvironment.application;
         mService = new TetherService();
         ReflectionHelpers.setField(mService, "mBase", mAppContext);
         mService.setHotspotOffReceiver(new HotspotOffReceiver(mContext));
@@ -69,8 +66,15 @@ public class TetherServiceTest {
 
         mService.scheduleAlarm();
 
-        assertThat(mShadowApplication.hasReceiverForIntent(
-            new Intent(WifiManager.WIFI_AP_STATE_CHANGED_ACTION))).isTrue();
+        boolean found = false;
+        for (Wrapper wrapper : ShadowApplication.getInstance().getRegisteredReceivers()) {
+            if (wrapper.intentFilter.matchAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
+                found = true;
+                break;
+            }
+        }
+
+        assertThat(found).isTrue();
     }
 
     @Test

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java

@@ -29,7 +29,6 @@ import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -39,10 +38,8 @@ 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 WifiTetherApBandPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java

@@ -22,7 +22,6 @@ import android.content.Context;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -30,11 +29,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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 WifiTetherAutoOffPreferenceControllerTest {
+
     private static final String KEY_PREF = "wifi_tether_auto_off";
     private static final int ON = 1;
     private static final int OFF = 0;

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java

@@ -28,7 +28,6 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.ValidatedEditTextPreference;
 
@@ -39,11 +38,8 @@ 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 WifiTetherPasswordPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java

@@ -18,13 +18,10 @@ package com.android.settings.wifi.tether;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_START;
 import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
-
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -42,8 +39,6 @@ import android.net.wifi.WifiManager;
 import android.provider.Settings;
 import android.support.v7.preference.PreferenceScreen;
 
-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.widget.MasterSwitchPreference;
@@ -59,18 +54,14 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowSettings;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.ArrayList;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
-                WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
-                WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class
-        })
+@Config(shadows = {
+    WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
+    WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
+    WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class
+})
 public class WifiTetherPreferenceControllerTest {
 
     private static final String SSID = "Pixel";
@@ -177,7 +168,7 @@ public class WifiTetherPreferenceControllerTest {
     public void testReceiver_goingToAirplaneMode_shouldClearPreferenceSummary() {
         final ContentResolver cr = mock(ContentResolver.class);
         when(mContext.getContentResolver()).thenReturn(cr);
-        ShadowSettings.ShadowGlobal.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
+        Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
         mController.displayPreference(mScreen);
         final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
         final Intent broadcast = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -242,8 +233,8 @@ public class WifiTetherPreferenceControllerTest {
     @Implements(WifiTetherSwitchBarController.class)
     public static final class ShadowWifiTetherSwitchBarController {
 
-        public static boolean onStartCalled;
-        public static boolean onStopCalled;
+        private static boolean onStartCalled;
+        private static boolean onStopCalled;
 
         public static void reset() {
             onStartCalled = false;

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java

@@ -28,7 +28,6 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.widget.ValidatedEditTextPreference;
 
@@ -39,10 +38,8 @@ 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 WifiTetherSSIDPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java

@@ -20,15 +20,12 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.wifi.WifiConfiguration;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class WifiTetherSettingsTest {
 
     @Test