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/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
@@ -30,13 +29,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AdvancedConnectedDeviceDashboardFragmentTest {
+
     private AdvancedConnectedDeviceDashboardFragment mFragment;
 
     @Before
@@ -54,9 +52,8 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
     @Test
     public void testSearchIndexProvider_shouldIndexResource() {
         final List<SearchIndexableResource> indexRes =
-                mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        RuntimeEnvironment.application,
-                        true /* enabled */);
+            AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
 
         assertThat(indexRes).isNotNull();
         assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
@@ -72,7 +69,7 @@ public class AdvancedConnectedDeviceDashboardFragmentTest {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(context);
-        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
+        final int xmlId = new ConnectedDeviceDashboardFragment().getPreferenceScreenResId();
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 

tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java

@@ -19,65 +19,49 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.provider.Settings;
+import android.provider.Settings.Secure;
 import android.util.FeatureFlagUtils;
 
-import com.android.settings.TestConfig;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 
-import org.junit.After;
 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, shadows =
-        SettingsShadowSystemProperties.class)
 public class BluetoothOnWhileDrivingPreferenceControllerTest {
+
     private BluetoothOnWhileDrivingPreferenceController mController;
     private Context mContext;
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mController = new BluetoothOnWhileDrivingPreferenceController(mContext);
     }
 
-    @After
-    public void teardown() {
-        SettingsShadowSystemProperties.clear();
-    }
-
     @Test
     public void getAvailabilityStatus_onWhenEnabled() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING, true);
 
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
+            .isEqualTo(BasePreferenceController.AVAILABLE);
     }
 
     @Test
     public void getAvailabilityStatus_offWhenDisabled() {
         assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+            .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
     }
 
     @Test
     public void setChecked_togglesSettingSecure() {
         mController.setChecked(true);
 
-        assertThat(
-                Settings.Secure.getInt(
-                        mContext.getContentResolver(),
-                        Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
-                        0))
-                .isEqualTo(1);
+        final String name = Secure.BLUETOOTH_ON_WHILE_DRIVING;
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(), name, 0)).isEqualTo(1);
     }
 }

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java

@@ -16,11 +16,11 @@
 package com.android.settings.connecteddevice;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
@@ -29,7 +29,6 @@ import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.TestConfig;
 import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
 import com.android.settings.dashboard.DashboardFragment;
@@ -43,11 +42,10 @@ import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ConnectedDeviceGroupControllerTest {
+
     private static final String PREFERENCE_KEY_1 = "pref_key_1";
 
     @Mock
@@ -78,7 +76,7 @@ public class ConnectedDeviceGroupControllerTest {
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         mPreferenceGroup = spy(new PreferenceScreen(mContext, null));
-        doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
+        when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager);
         doReturn(mContext).when(mDashboardFragment).getContext();
 
         mConnectedDeviceGroupController = new ConnectedDeviceGroupController(mDashboardFragment,

tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java

@@ -16,15 +16,12 @@
 package com.android.settings.connecteddevice.usb;
 
 import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,11 +32,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 ConnectedUsbDeviceUpdaterTest {
+
     private Context mContext;
     private ConnectedUsbDeviceUpdater mDeviceUpdater;
 
@@ -58,8 +54,8 @@ public class ConnectedUsbDeviceUpdaterTest {
 
         mContext = RuntimeEnvironment.application;
         when(mFragment.getContext()).thenReturn(mContext);
-        mDeviceUpdater = new ConnectedUsbDeviceUpdater(mFragment, mDevicePreferenceCallback,
-                mUsbBackend);
+        mDeviceUpdater =
+            new ConnectedUsbDeviceUpdater(mFragment, mDevicePreferenceCallback, mUsbBackend);
         mDeviceUpdater.mUsbReceiver = mUsbReceiver;
     }
 
@@ -68,16 +64,16 @@ public class ConnectedUsbDeviceUpdaterTest {
         mDeviceUpdater.initUsbPreference(mContext);
 
         assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
-        assertThat(mDeviceUpdater.mUsbPreference.getIcon()).isEqualTo(mContext.getDrawable(
-                R.drawable.ic_usb));
+        assertThat(mDeviceUpdater.mUsbPreference.getIcon())
+            .isEqualTo(mContext.getDrawable(R.drawable.ic_usb));
         assertThat(mDeviceUpdater.mUsbPreference.isSelectable()).isFalse();
     }
 
     @Test
     public void testInitUsbPreference_usbConnected_preferenceAdded() {
         mDeviceUpdater.initUsbPreference(mContext);
-        mDeviceUpdater.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
-                UsbBackend.MODE_DATA_NONE);
+        mDeviceUpdater.mUsbConnectionListener
+            .onUsbConnectionChanged(true /* connected */, UsbBackend.MODE_DATA_NONE);
 
         verify(mDevicePreferenceCallback).onDeviceAdded(mDeviceUpdater.mUsbPreference);
     }
@@ -85,10 +81,9 @@ public class ConnectedUsbDeviceUpdaterTest {
     @Test
     public void testInitUsbPreference_usbDisconnected_preferenceRemoved() {
         mDeviceUpdater.initUsbPreference(mContext);
-        mDeviceUpdater.mUsbConnectionListener.onUsbConnectionChanged(false /* connected */,
-                UsbBackend.MODE_DATA_NONE);
+        mDeviceUpdater.mUsbConnectionListener
+            .onUsbConnectionChanged(false /* connected */, UsbBackend.MODE_DATA_NONE);
 
         verify(mDevicePreferenceCallback).onDeviceRemoved(mDeviceUpdater.mUsbPreference);
     }
-
 }

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java

@@ -17,9 +17,6 @@
 package com.android.settings.connecteddevice.usb;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -28,7 +25,6 @@ import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
 import com.android.settings.wrapper.UserManagerWrapper;
 
 import org.junit.Before;
@@ -36,10 +32,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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 UsbBackendTest {
 
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -58,7 +52,7 @@ public class UsbBackendTest {
             .thenReturn(true);
         when((Object)mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn((Object) mConnectivityManager);
+                .thenReturn(mConnectivityManager);
     }
 
     @Test

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java

@@ -16,20 +16,12 @@
 package com.android.settings.connecteddevice.usb;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.usb.UsbManager;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -38,17 +30,14 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
+import org.robolectric.shadows.ShadowApplication.Wrapper;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsbConnectionBroadcastReceiverTest {
+
     private Context mContext;
     private UsbConnectionBroadcastReceiver mReceiver;
-    private ShadowApplication mShadowApplication;
 
     @Mock
     private UsbConnectionBroadcastReceiver.UsbConnectionListener mListener;
@@ -59,7 +48,6 @@ public class UsbConnectionBroadcastReceiverTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mShadowApplication = ShadowApplication.getInstance();
         mContext = RuntimeEnvironment.application;
         mReceiver = new UsbConnectionBroadcastReceiver(mContext, mListener, mUsbBackend);
     }
@@ -104,9 +92,7 @@ public class UsbConnectionBroadcastReceiverTest {
         mReceiver.register();
         mReceiver.register();
 
-        final List<BroadcastReceiver> receivers = mShadowApplication.getReceiversForIntent(
-                new Intent(UsbManager.ACTION_USB_STATE));
-        assertHasOneUsbConnectionBroadcastReceiver(receivers);
+        assertThat(countUsbConnectionBroadcastReceivers()).isEqualTo(1);
     }
 
     @Test
@@ -115,29 +101,16 @@ public class UsbConnectionBroadcastReceiverTest {
         mReceiver.unregister();
         mReceiver.unregister();
 
-        final List<BroadcastReceiver> receivers = mShadowApplication.getReceiversForIntent(
-                new Intent(UsbManager.ACTION_USB_STATE));
-        assertHasNoUsbConnectionBroadcastReceiver(receivers);
+        assertThat(countUsbConnectionBroadcastReceivers()).isEqualTo(0);
     }
 
-    private void assertHasOneUsbConnectionBroadcastReceiver(List<BroadcastReceiver> receivers) {
-        boolean hasReceiver = false;
-        for (final BroadcastReceiver receiver : receivers) {
-            if (receiver instanceof UsbConnectionBroadcastReceiver) {
-                // If hasReceiver is true, then we're at the second copy of it so fail.
-                assertWithMessage(
-                        "Only one instance of UsbConnectionBroadcastReceiver should be "
-                                + "registered").that(
-                        hasReceiver).isFalse();
-                hasReceiver = true;
+    private int countUsbConnectionBroadcastReceivers() {
+        int count = 0;
+        for (Wrapper wrapper : ShadowApplication.getInstance().getRegisteredReceivers()) {
+            if (wrapper.getBroadcastReceiver() instanceof UsbConnectionBroadcastReceiver) {
+                count++;
             }
         }
-        assertThat(hasReceiver).isTrue();
-    }
-
-    private void assertHasNoUsbConnectionBroadcastReceiver(List<BroadcastReceiver> receivers) {
-        for (final BroadcastReceiver receiver : receivers) {
-            assertThat(receiver instanceof UsbConnectionBroadcastReceiver).isFalse();
-        }
+        return count;
     }
 }

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java

@@ -17,13 +17,11 @@
 package com.android.settings.connecteddevice.usb;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.hardware.usb.UsbManager;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
@@ -31,10 +29,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 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 UsbDefaultFragmentTest {
 
     @Mock

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java

@@ -16,24 +16,19 @@
 
 package com.android.settings.connecteddevice.usb;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -49,8 +44,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
-        shadows = {ShadowEntityHeaderController.class, SettingsShadowResources.class})
+@Config(shadows = ShadowEntityHeaderController.class)
 public class UsbDetailsHeaderControllerTest {
 
     private UsbDetailsHeaderController mDetailsHeaderController;
@@ -104,8 +98,8 @@ public class UsbDetailsHeaderControllerTest {
         mDetailsHeaderController.refresh(UsbBackend.MODE_DATA_NONE);
         verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));
         verify(mHeaderController).setIcon(mContext.getDrawable(R.drawable.ic_usb));
-        verify(mHeaderController).setSummary(
-                mContext.getString(R.string.usb_summary_charging_only));
+        verify(mHeaderController)
+            .setSummary(mContext.getString(R.string.usb_summary_charging_only));
         verify(mHeaderController).done(mActivity, true);
     }
 
@@ -115,8 +109,8 @@ public class UsbDetailsHeaderControllerTest {
         mDetailsHeaderController.refresh(UsbBackend.MODE_DATA_MTP);
         verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));
         verify(mHeaderController).setIcon(mContext.getDrawable(R.drawable.ic_usb));
-        verify(mHeaderController).setSummary(
-                mContext.getString(R.string.usb_summary_file_transfers));
+        verify(mHeaderController)
+            .setSummary(mContext.getString(R.string.usb_summary_file_transfers));
         verify(mHeaderController).done(mActivity, true);
     }
 }

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.connecteddevice.usb;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -25,27 +24,20 @@ import static org.mockito.Mockito.when;
 import android.app.Activity;
 import android.content.Context;
 import android.hardware.usb.UsbManager;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
 
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-
 import com.google.android.collect.Lists;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -55,7 +47,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsbDetailsProfilesControllerTest {
 
     private UsbDetailsProfilesController mDetailsProfilesController;
@@ -238,7 +229,7 @@ public class UsbDetailsProfilesControllerTest {
     }
 
     private List<SwitchPreference> getProfileSwitches() {
-        ArrayList<SwitchPreference> result = new ArrayList<>();
+        List<SwitchPreference> result = new ArrayList<>();
         for (int i = 0; i < mPreference.getPreferenceCount(); i++) {
             result.add((SwitchPreference) mPreference.getPreference(i));
         }