PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare tests for impending robolectric merge

Browse Source 
Setting's ShadowUserManager.reset() was unnecessary and collided with a
newly introduced reset() method in its super class. It has been removed.

Test: make -j56 RunSettingsGoogleRoboTests &&
  make -j56 RunSettingsRoboTests &&
  make -j56 RunSettingsLibRoboTests

Change-Id: I63c50eca0de3581fd4f64f4862233446f5937d0c
This commit is contained in:
James Lemieux
2018-11-19 16:48:58 -08:00
parent bd088c4205
commit 1fc96ea98d
13 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
View File

@@ -77,11 +77,6 @@ public class AppMemoryPreferenceControllerTest {
when(mFragment.getActivity()).thenReturn(mActivity);
}
@After
public void tearDown() {
ShadowUserManager.getShadow().reset();
}
@Test
@Config(qualifiers = "mcc999")
public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() {

5
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -91,11 +91,6 @@ public class DataUsageSummaryTest {
.createSummaryProvider(mActivity, mSummaryLoader);
}
@After
public void tearDown() {
ShadowUserManager.getShadow().reset();
}
@Test
public void formatUsage_shouldLookLikeFormatFileSize() {
SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix,

1
tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
View File

@@ -75,7 +75,6 @@ public class DevelopmentSettingsDashboardFragmentTest {
@After
public void tearDown() {
ShadowEnableDevelopmentSettingWarningDialog.reset();
mShadowUserManager.reset();
}
@Test

1
tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
View File

@@ -70,7 +70,6 @@ public class DevelopmentSwitchBarControllerTest {
@After
public void tearDown() {
ShadowUtils.reset();
ShadowUserManager.getShadow().reset();
}
@Test

1
tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
View File

@@ -48,7 +48,6 @@ public class RedactionInterstitialTest {
@After
public void tearDown() {
ShadowUserManager.getShadow().reset();
ShadowRestrictedLockUtilsInternal.reset();
}

5
tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
View File

@@ -57,11 +57,6 @@ public class EncryptionStatusPreferenceControllerTest {
mPreference = new Preference(mContext);
}
@After
public void tearDown() {
mShadowUserManager.reset();
}
@Test
public void isAvailable_admin_true() {
mShadowUserManager.setIsAdminUser(true);

5
tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
View File

@@ -63,11 +63,6 @@ public class RestrictedEncryptionPreferenceControllerTest {
mUserManager = ShadowUserManager.getShadow();
}
@After
public void tearDown() {
mUserManager.reset();
}
@Test
public void isAvailable_noRestriction_shouldReturnTrue() {
assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();

1
tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
View File

@@ -90,7 +90,6 @@ public class SlicesDatabaseAccessorTest {
@After
public void cleanUp() {
ShadowUserManager.getShadow().reset();
DatabaseTestUtils.clearDb(mContext);
}

1
tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
View File

@@ -48,7 +48,6 @@ public class SystemDashboardFragmentTest {
@After
public void tearDown() {
SettingsShadowResources.reset();
ShadowUserManager.getShadow().reset();
}
@Test

15
tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
View File

@@ -49,19 +49,6 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
private int[] profileIdsForUser = new int[0];
private boolean mUserSwitchEnabled;
@Resetter
public void reset() {
mUserInfos.clear();
mRestrictions.clear();
mUserProfileInfos.clear();
mRestrictionSources.clear();
mManagedProfiles.clear();
mIsQuietModeEnabled = false;
mUserSwitchEnabled = false;
profileIdsForUser = new int[0];
}
public void setUserInfo(int userHandle, UserInfo userInfo) {
mUserInfos.put(userHandle, userInfo);
}
@@ -90,7 +77,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
}
@Implementation
public List<UserHandle> getUserProfiles(){
public List<UserHandle> getUserProfiles() {
int[] userIds = getProfileIds(UserHandle.myUserId(), true /* enabledOnly */);
List<UserHandle> result = new ArrayList<>(userIds.length);
for (int userId : userIds) {

5
tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
View File

@@ -63,11 +63,6 @@ public class AddUserWhenLockedPreferenceControllerTest {
mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
}
@After
public void tearDown() {
mUserManager.reset();
}
@Test
public void displayPref_NotAdmin_shouldNotDisplay() {
mUserManager.setUserInfo(0, mUserInfo);

5
tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
View File

@@ -105,11 +105,6 @@ public class EditUserInfoControllerTest {
mController = new TestEditUserInfoController();
}
@After
public void tearDown() {
mUserManager.reset();
}
@Test
public void photoControllerOnActivityResult_whenWaiting_isCalled() {
mController.createDialog(mFragment, mCurrentIcon, "test user",

5
tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
View File

@@ -45,11 +45,6 @@ public class UserCapabilitiesTest {
mUserManager = ShadowUserManager.getShadow();
}
@After
public void tearDown() {
mUserManager.reset();
}
@Test
public void disallowUserSwitch_restrictionIsSet_true() {
mUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),