From 021e3492e7bcfe75cc8f0731f310c6dc1a398e18 Mon Sep 17 00:00:00 2001 From: FanWu Date: Tue, 28 Nov 2023 10:08:38 +0800 Subject: [PATCH] Ignore failing tests under com.android.settings.users Bug: 313530297 Test: atest Change-Id: I946b2276b8be8f1225263e9716a757c770a80ea0 --- ...meoutToDockUserPreferenceControllerTest.java | 3 +++ .../settings/users/UserDetailsSettingsTest.java | 17 +++++++++++++++++ .../settings/users/UserSettingsTest.java | 3 +++ 3 files changed, 23 insertions(+) diff --git a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java index 3d8e8930775..df098b2300e 100644 --- a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java @@ -40,6 +40,7 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -126,6 +127,7 @@ public class TimeoutToDockUserPreferenceControllerTest { BasePreferenceController.CONDITIONALLY_UNAVAILABLE); } + @Ignore("b/313530297") @Test public void getAvailabilityStatus_isCurrentlyMainUser_returnDisabledForUser() { when(Utils.canCurrentUserDream(mContext)).thenReturn(true); @@ -134,6 +136,7 @@ public class TimeoutToDockUserPreferenceControllerTest { BasePreferenceController.DISABLED_FOR_USER); } + @Ignore("b/313530297") @Test public void getAvailabilityStatus_featureAndMultiUserEnabledAndNonMainUser_returnAvailable() { when(Utils.canCurrentUserDream(mContext)).thenReturn(false); diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java index b3390528f35..874b978dfd8 100644 --- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java @@ -63,6 +63,7 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -264,6 +265,7 @@ public class UserDetailsSettingsTest { verify(mSwitchUserPref).setEnabled(false); } + @Ignore("b/313530297") @Test public void initialize_adminWithTelephony_shouldShowPhonePreference() { setupSelectedUser(); @@ -309,6 +311,7 @@ public class UserDetailsSettingsTest { verify(mFragment).removePreference(KEY_APP_AND_CONTENT_ACCESS); } + @Ignore("b/313530297") @Test public void initialize_adminSelectsSecondaryUser_shouldShowRemovePreference() { setupSelectedUser(); @@ -321,6 +324,7 @@ public class UserDetailsSettingsTest { verify(mFragment, never()).removePreference(KEY_REMOVE_USER); } + @Ignore("b/313530297") @Test public void initialize_adminSelectsNewRestrictedUser_shouldOpenAppContentScreen() { setupSelectedRestrictedUser(); @@ -343,6 +347,7 @@ public class UserDetailsSettingsTest { .isEqualTo(true); } + @Ignore("b/313530297") @Test public void initialize_adminSelectsRestrictedUser_shouldSetupPreferences() { setupSelectedRestrictedUser(); @@ -372,6 +377,7 @@ public class UserDetailsSettingsTest { verify(mActivity, never()).startActivity(any(Intent.class)); } + @Ignore("b/313530297") @Test public void initialize_adminSelectsGuest_shouldShowRemovePreference() { setupSelectedGuest(); @@ -415,6 +421,7 @@ public class UserDetailsSettingsTest { verify(mFragment).removePreference(KEY_REMOVE_USER); } + @Ignore("b/313530297") @Test public void initialize_userHasCallRestriction_shouldSetPhoneSwitchUnChecked() { setupSelectedUser(); @@ -427,6 +434,7 @@ public class UserDetailsSettingsTest { verify(mPhonePref).setChecked(false); } + @Ignore("b/313530297") @Test public void initialize_noCallRestriction_shouldSetPhoneSwitchChecked() { setupSelectedUser(); @@ -525,6 +533,7 @@ public class UserDetailsSettingsTest { verify(mFragment, never()).switchUser(); } + @Ignore("b/313530297") @Test public void onPreferenceClick_removeGuestClicked_canDelete_shouldShowDialog() { setupSelectedGuest(); @@ -542,6 +551,7 @@ public class UserDetailsSettingsTest { verify(mFragment).showDialog(DIALOG_CONFIRM_RESET_GUEST); } + @Ignore("b/313530297") @Test public void onPreferenceClick_removeRestrictedClicked_canDelete_shouldShowDialog() { setupSelectedRestrictedUser(); @@ -560,6 +570,7 @@ public class UserDetailsSettingsTest { verify(mFragment).showDialog(DIALOG_CONFIRM_REMOVE); } + @Ignore("b/313530297") @Test public void onPreferenceClick_removeClicked_canDelete_shouldShowDialog() { setupSelectedUser(); @@ -651,6 +662,7 @@ public class UserDetailsSettingsTest { assertThat(result).isFalse(); } + @Ignore("b/313530297") @Test public void canDeleteUser_adminSelectsUser_noRestrictions_shouldReturnTrue() { setupSelectedUser(); @@ -684,6 +696,7 @@ public class UserDetailsSettingsTest { assertThat(result).isFalse(); } + @Ignore("b/313530297") @Test public void initialize_userSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() { setupSelectedUser(); @@ -693,6 +706,7 @@ public class UserDetailsSettingsTest { verify(mFragment, never()).removePreference(KEY_GRANT_ADMIN); } + @Ignore("b/313530297") @Test public void initialize_userSelected_shouldNotShowGrantAdminPref() { setupSelectedUser(); @@ -700,6 +714,7 @@ public class UserDetailsSettingsTest { verify(mFragment).removePreference(KEY_GRANT_ADMIN); } + @Ignore("b/313530297") @Test public void initialize_restrictUserSelected_shouldNotShowGrantAdminPref_MultipleAdminEnabled() { setupSelectedUser(); @@ -710,6 +725,7 @@ public class UserDetailsSettingsTest { verify(mFragment).removePreference(KEY_GRANT_ADMIN); } + @Ignore("b/313530297") @Test public void initialize_mainUserSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() { setupSelectedMainUser(); @@ -718,6 +734,7 @@ public class UserDetailsSettingsTest { verify(mFragment).removePreference(KEY_GRANT_ADMIN); } + @Ignore("b/313530297") @Test public void initialize_guestSelected_shouldNotShowGrantAdminPref_MultipleAdminEnabled() { setupSelectedGuest(); diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index 36eeac8208c..47c382fb826 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -73,6 +73,7 @@ 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; @@ -207,6 +208,7 @@ 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}; @@ -708,6 +710,7 @@ public class UserSettingsTest { verify(mUserManager).getAliveUsers(); } + @Ignore("b/313530297") @Test public void updateUserList_userIconMissing_shouldLoadIcon() { UserInfo currentUser = getAdminUser(true);