diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 47c382fb826..0f647aa1833 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -47,6 +47,7 @@ import android.content.pm.UserInfo; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.Looper; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; @@ -73,7 +74,6 @@ import com.android.settingslib.search.SearchIndexableRaw; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.AdditionalMatchers; @@ -208,12 +208,11 @@ public class UserSettingsTest { assertThat(UserSettings.assignDefaultPhoto(null, ACTIVE_USER_ID)).isFalse(); } - @Ignore("b/313530297") @Test public void testGetRawDataToIndex_returnAllIndexablePreferences() { String[] expectedKeys = {KEY_ALLOW_MULTIPLE_USERS}; List keysResultList = new ArrayList<>(); - + ShadowUserManager.getShadow().setSupportsMultipleUsers(true); List rawData = UserSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true); @@ -710,7 +709,6 @@ public class UserSettingsTest { verify(mUserManager).getAliveUsers(); } - @Ignore("b/313530297") @Test public void updateUserList_userIconMissing_shouldLoadIcon() { UserInfo currentUser = getAdminUser(true); @@ -722,6 +720,7 @@ public class UserSettingsTest { doReturn(userIcon).when(mUserManager).getUserIcon(ACTIVE_USER_ID); mFragment.updateUserList(); + shadowOf(Looper.getMainLooper()).idle(); verify(mUserManager).getUserIcon(ACTIVE_USER_ID); // updateUserList should be called another time after loading the icons