Use binary resource support in robolectric

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

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

tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java

@@ -23,17 +23,17 @@ import android.content.Context;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowPrivacySettingsUtils.class})
 public class AutoRestorePreferenceControllerTest {
     private Context mContext;

tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java

@@ -24,17 +24,17 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowPrivacySettingsUtils.class})
 public class BackupDataPreferenceControllerTest {
     private Context mContext;

tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java

@@ -23,17 +23,17 @@ import android.content.Context;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowPrivacySettingsUtils.class})
 public class BackupInactivePreferenceControllerTest {
     private Context mContext;

tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java

@@ -18,9 +18,7 @@ package com.android.settings.backup;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.app.backup.BackupManager;
 import android.content.Context;
@@ -29,26 +27,25 @@ import android.os.UserManager;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowUserManager;
 
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class)
+@RunWith(RobolectricTestRunner.class)
 public class BackupSettingsActivityPreferenceControllerTest {
 
     private static final String KEY_BACKUP_SETTINGS = "backup_settings";
 
     private Context mContext;
-    @Mock
+    private BackupManager mBackupManager;
     private UserManager mUserManager;
 
     @Mock
@@ -56,20 +53,25 @@ public class BackupSettingsActivityPreferenceControllerTest {
 
     private BackupSettingsActivityPreferenceController mController;
 
-    private static boolean mBackupEnabled;
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+
+        mContext = RuntimeEnvironment.application;
+        mBackupManager = new BackupManager(mContext);
+
+        final ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.grantPermissions(android.Manifest.permission.BACKUP);
+        shadowApplication.setSystemService(Context.BACKUP_SERVICE, mBackupManager);
+
+        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
 
         mController = new BackupSettingsActivityPreferenceController(mContext, KEY_BACKUP_SETTINGS);
     }
 
     @Test
     public void updateState_backupOn() {
-        mBackupEnabled = true;
+        mBackupManager.setBackupEnabled(true);
 
         mController.updateState(mBackupPreference);
         String summaryString = mContext.getString(R.string.backup_summary_state_on);
@@ -78,7 +80,7 @@ public class BackupSettingsActivityPreferenceControllerTest {
 
     @Test
     public void updateState_backupOff() {
-        mBackupEnabled = false;
+        mBackupManager.setBackupEnabled(false);
 
         mController.updateState(mBackupPreference);
         String summaryString = mContext.getString(R.string.backup_summary_state_off);
@@ -87,14 +89,16 @@ public class BackupSettingsActivityPreferenceControllerTest {
 
     @Test
     public void isAvailable_systemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(true);
+        final ShadowUserManager sum = Shadow.extract(mUserManager);
+        sum.setIsAdminUser(true);
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void isAvailable_nonSystemUser() {
-        when(mUserManager.isAdminUser()).thenReturn(false);
+        final ShadowUserManager sum = Shadow.extract(mUserManager);
+        sum.setIsAdminUser(false);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -103,13 +107,4 @@ public class BackupSettingsActivityPreferenceControllerTest {
     public void getPreferenceKey() {
         assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUP_SETTINGS);
     }
-
-    @Implements(BackupManager.class)
-    public static class ShadowBackupManager {
-
-        @Implementation
-        public boolean isBackupEnabled() {
-            return mBackupEnabled;
-        }
-    }
 }

tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java

@@ -18,9 +18,9 @@ package com.android.settings.backup;
 
 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.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -36,7 +36,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -45,6 +44,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.android.controller.ActivityController;
@@ -56,7 +56,7 @@ import org.robolectric.shadows.ShadowPackageManager;
 
 import java.util.List;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
                 BackupSettingsActivityTest.ShadowUserHandle.class})
 public class BackupSettingsActivityTest {
@@ -155,12 +155,12 @@ public class BackupSettingsActivityTest {
     @Implements(BackupSettingsHelper.class)
     public static class ShadowBackupSettingsHelper {
         @Implementation
-        public Intent getIntentForBackupSettings() {
+        protected Intent getIntentForBackupSettings() {
             return mIntent;
         }
 
         @Implementation
-        public boolean isBackupProvidedByManufacturer() {
+        protected boolean isBackupProvidedByManufacturer() {
             return mIsBackupProvidedByOEM;
         }
     }
@@ -174,7 +174,7 @@ public class BackupSettingsActivityTest {
         }
 
         @Implementation
-        public static int myUserId() {
+        protected static int myUserId() {
             return sUid;
         }
 

tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java

@@ -36,19 +36,19 @@ import android.os.IBinder;
 import android.os.RemoteException;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = BackupSettingsHelperTest.ShadowBackupManagerStub.class)
 public class BackupSettingsHelperTest {
 
@@ -317,7 +317,7 @@ public class BackupSettingsHelperTest {
     }
 
     @Test
-    public void testIsBackupProvidedByManufacturer_WithIntent() throws Exception {
+    public void testIsBackupProvidedByManufacturer_WithIntent() {
         String intent = "test_intent";
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
@@ -332,7 +332,7 @@ public class BackupSettingsHelperTest {
     }
 
     @Test
-    public void testIsBackupProvidedByManufacturer_WithoutIntent() throws Exception {
+    public void testIsBackupProvidedByManufacturer_WithoutIntent() {
         String intent = "";
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
@@ -347,7 +347,7 @@ public class BackupSettingsHelperTest {
     }
 
     @Test
-    public void testGetLabelProvidedByManufacturer() throws Exception {
+    public void testGetLabelProvidedByManufacturer() {
         String label = "test_label";
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
@@ -362,7 +362,7 @@ public class BackupSettingsHelperTest {
     }
 
     @Test
-    public void testGetIntentProvidedByManufacturer() throws Exception {
+    public void testGetIntentProvidedByManufacturer() {
         String intent = "test_intent";
 
         when(mContext.getApplicationContext()).thenReturn(mContext);

tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java

@@ -28,19 +28,18 @@ import android.content.Intent;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class)
 public class BackupSettingsPreferenceControllerTest {
 

tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java

@@ -25,7 +25,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -33,10 +32,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowPrivacySettingsUtils.class})
 public class ConfigureAccountPreferenceControllerTest {
     private Context mContext;

tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java

@@ -24,7 +24,6 @@ import android.content.Intent;
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -32,10 +31,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowPrivacySettingsUtils.class})
 public class DataManagementPreferenceControllerTest {
     private final String KEY = "data_management";
@@ -70,8 +70,7 @@ public class DataManagementPreferenceControllerTest {
         mPSCD.setManageIntent(mIntent);
         mPSCD.setManageLabel(mTitle);
         mController.updateState(mPreference);
-        assertThat(mPreference.getTitle())
-                .isEqualTo(mTitle);
+        assertThat(mPreference.getTitle()).isEqualTo(mTitle);
     }
 
     @Test