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

Merge "Fix LocationForWorkPreferenceControllerTest"

Browse Source
This commit is contained in:
Alex Johnston
2020-02-05 14:49:00 +00:00
committed by Android (Google) Code Review
parent bc5e1646d5 f566da5b55
commit 1b2670fae4
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
View File

@@ -38,7 +38,6 @@ import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
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.Mock; import org.mockito.Mock;
@@ -114,7 +113,6 @@ public class LocationForWorkPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void onLocationModeChanged_disabledByAdmin_shouldDisablePreference() { public void onLocationModeChanged_disabledByAdmin_shouldDisablePreference() {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
final EnforcedAdmin admin = mock(EnforcedAdmin.class); final EnforcedAdmin admin = mock(EnforcedAdmin.class);
@@ -124,11 +122,9 @@ public class LocationForWorkPreferenceControllerTest {
mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false); mController.onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, false);
verify(mPreference).setDisabledByAdmin(any()); verify(mPreference).setDisabledByAdmin(any());
verify(mPreference).setChecked(false);
} }
@Test @Test
@Ignore
public void onLocationModeChanged_locationOff_shouldDisablePreference() { public void onLocationModeChanged_locationOff_shouldDisablePreference() {
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt()); doReturn(null).when(mEnabler).getShareLocationEnforcedAdmin(anyInt());
@@ -138,7 +134,7 @@ public class LocationForWorkPreferenceControllerTest {
verify(mPreference).setEnabled(false); verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false); verify(mPreference).setChecked(false);
verify(mPreference).setSummary(R.string.switch_off_text); verify(mPreference).setSummary(R.string.location_app_permission_summary_location_off);
} }
@Test @Test