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/applications/manageapplications/AppFilterItemTest.java

@@ -16,26 +16,20 @@
 
 package com.android.settings.applications.manageapplications;
 
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_BLOCKED;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_ENABLED;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.applications.AppStateUsageBridge;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
 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 AppFilterItemTest {
 
     @Test

tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java

@@ -16,76 +16,53 @@
 
 package com.android.settings.applications.manageapplications;
 
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_INSTALL_SOURCES;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WITH_OVERLAY;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WRITE_SETTINGS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_GAMES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_HIGH_POWER;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MANAGE_SOURCES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MOVIES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_NOTIFICATION;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_OVERLAY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_PHOTOGRAPHY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_STORAGE;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS;
 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;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AppFilterRegistryTest {
 
-    @Test
-    public void getDefaultType_shouldMatchForAllListType() {
-        final AppFilterRegistry registry = AppFilterRegistry.getInstance();
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
-                .isEqualTo(FILTER_APPS_USAGE_ACCESS);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
-                .isEqualTo(FILTER_APPS_POWER_WHITELIST);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY)).isEqualTo(
-                FILTER_APPS_WITH_OVERLAY);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS)).isEqualTo(
-                FILTER_APPS_WRITE_SETTINGS);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES)).isEqualTo(
-                FILTER_APPS_INSTALL_SOURCES);
+  @Test
+  public void getDefaultType_shouldMatchForAllListType() {
+    final AppFilterRegistry registry = AppFilterRegistry.getInstance();
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
+        .isEqualTo(FILTER_APPS_USAGE_ACCESS);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
+        .isEqualTo(FILTER_APPS_POWER_WHITELIST);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
+        .isEqualTo(FILTER_APPS_WITH_OVERLAY);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
+        .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
+        .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
 
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN))
-                .isEqualTo(FILTER_APPS_ALL);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
-                .isEqualTo(FILTER_APPS_ALL);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION)).isEqualTo(FILTER_APPS_ALL);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
 
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
-        assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
-    }
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
+    assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
+  }
 }
-

tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java

@@ -26,7 +26,6 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
 
@@ -34,10 +33,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ApplicationViewHolderTest {
 
     private Context mContext;

tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java

@@ -16,15 +16,10 @@
 
 package com.android.settings.applications.manageapplications;
 
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_NOTIFICATION;
-
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
 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;
@@ -47,11 +42,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.android.settings.R;
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 import com.android.settings.widget.LoadingViewController;
 import com.android.settingslib.applications.ApplicationsState;
 
@@ -61,24 +52,12 @@ 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.fakes.RoboMenuItem;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 
-/**
- * Tests for {@link ManageApplications}.
- */
 @RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowTheme.class,
-                ShadowEventLogWriter.class
-        })
 public class ManageApplicationsTest {
 
     @Mock
@@ -88,7 +67,6 @@ public class ManageApplicationsTest {
     @Mock
     private Menu mMenu;
     private MenuItem mAppReset;
-    private Looper mBgLooper;
     private ManageApplications mFragment;
 
     @Before
@@ -97,8 +75,7 @@ public class ManageApplicationsTest {
         mAppReset = new RoboMenuItem(R.id.reset_app_preferences);
         ReflectionHelpers.setStaticField(ApplicationsState.class, "sInstance", mState);
         when(mState.newSession(any())).thenReturn(mSession);
-        mBgLooper = Looper.myLooper();
-        when(mState.getBackgroundLooper()).thenReturn(mBgLooper);
+        when(mState.getBackgroundLooper()).thenReturn(Looper.myLooper());
 
         mFragment = new ManageApplications();
     }

tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.applications.manageapplications;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -32,7 +31,6 @@ import android.text.format.Formatter;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource;
 
@@ -44,11 +42,8 @@ import org.mockito.ArgumentCaptor;
 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 MusicViewHolderControllerTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Fragment mFragment;
@@ -57,20 +52,17 @@ public class MusicViewHolderControllerTest {
 
     private Context mContext;
     private MusicViewHolderController mController;
-    private VolumeInfo mVolume;
-    private View mView;
     private ApplicationViewHolder mHolder;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController = new MusicViewHolderController(mContext, mSource, mVolume.fsUuid,
-                new UserHandle(0));
+        final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
+        mController = new MusicViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
 
-        mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
-        mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+        View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
     }
 
     @Test

tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java

@@ -17,7 +17,6 @@
 package com.android.settings.applications.manageapplications;
 
 import static com.google.common.truth.Truth.assertThat;
-
 import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -31,7 +30,6 @@ import android.text.format.Formatter;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.settings.TestConfig;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.StorageStatsSource;
 
@@ -43,10 +41,8 @@ import org.mockito.ArgumentCaptor;
 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 PhotosViewHolderControllerTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Fragment mFragment;
@@ -55,42 +51,37 @@ public class PhotosViewHolderControllerTest {
 
     private Context mContext;
     private PhotosViewHolderController mController;
-    private VolumeInfo mVolume;
-    private View mView;
     private ApplicationViewHolder mHolder;
 
-
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mVolume = new VolumeInfo("id", 0, null, "id");
-        mController =
-                new PhotosViewHolderController(
-                        mContext, mSource, mVolume.fsUuid, new UserHandle(0));
+        final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
+        mController = new PhotosViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
 
-        mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
-        mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+        final View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
+        mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
     }
 
     @Test
     public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
         mController.setupView(mHolder);
 
-        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
-                Formatter.formatFileSize(mContext, 0));
+        assertThat(mHolder.mSummary.getText().toString())
+            .isEqualTo(Formatter.formatFileSize(mContext, 0));
     }
 
     @Test
     public void storageShouldRepresentStorageStatsQuery() throws Exception {
         when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
-                .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
+            .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
 
         mController.queryStats();
         mController.setupView(mHolder);
 
-        assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
-                Formatter.formatFileSize(mContext, 11));
+        assertThat(mHolder.mSummary.getText().toString())
+            .isEqualTo(Formatter.formatFileSize(mContext, 11));
     }
 
     @Test