Merge "Fix tests in TimeoutToDockUserPreferenceControllerTest" into main

This commit is contained in:
Tetiana Meronyk
2023-11-30 11:51:26 +00:00
committed by Android (Google) Code Review

View File

@@ -33,7 +33,6 @@ import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryBackupHelperTest.ShadowUserHandle;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -130,7 +129,8 @@ public class TimeoutToDockUserPreferenceControllerTest {
@Ignore("b/313530297")
@Test
public void getAvailabilityStatus_isCurrentlyMainUser_returnDisabledForUser() {
when(Utils.canCurrentUserDream(mContext)).thenReturn(true);
when(mUserManager.getMainUser()).thenReturn(UserHandle.CURRENT);
when(mUserManager.isUserForeground()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_FOR_USER);
@@ -139,7 +139,7 @@ public class TimeoutToDockUserPreferenceControllerTest {
@Ignore("b/313530297")
@Test
public void getAvailabilityStatus_featureAndMultiUserEnabledAndNonMainUser_returnAvailable() {
when(Utils.canCurrentUserDream(mContext)).thenReturn(false);
when(mUserManager.isUserForeground()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.AVAILABLE);