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

Merge "Fix tests in UserSettingsTest" into main

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-11-29 12:46:32 +00:00
committed by Android (Google) Code Review
parent 0b6a023f80 bbbdc8423c
commit b3632f2ef6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/users/UserSettingsTest.java
View File

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