Update AmbientDisplayAlwaysOnPrefTest to sdk 26 (f279ba3f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.UserHandle;
		import android.provider.Settings;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;
		import android.support.annotation.VisibleForTesting;

		import com.android.internal.hardware.AmbientDisplayConfiguration;
		import com.android.settings.R;
		@@ -81,7 +82,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends

		@Override
		public boolean isAvailable() {
		return isAvailable(mConfig);
		return alwaysOnAvailableForUser(mConfig);
		}

		public static boolean isAvailable(AmbientDisplayConfiguration config) {
		@@ -102,4 +103,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends
		ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
		ON /* defaultValue */);
		}

		@VisibleForTesting
		boolean alwaysOnAvailableForUser(AmbientDisplayConfiguration config) {
		return isAvailable(config);
		}
		}

tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java

+37 −20

Original line number	Diff line number	Diff line
		@@ -17,7 +17,11 @@
		package com.android.settings.display;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		@@ -41,22 +45,27 @@ import org.mockito.MockitoAnnotations;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
		shadows = {ShadowSecureSettings.class})
		public class AmbientDisplayAlwaysOnPreferenceControllerTest {

		@Mock Context mContext;
		@Mock AmbientDisplayConfiguration mConfig;
		@Mock SwitchPreference mSwitchPreference;
		@Mock
		private Context mContext;
		@Mock
		private AmbientDisplayConfiguration mConfig;
		@Mock
		private SwitchPreference mSwitchPreference;

		AmbientDisplayAlwaysOnPreferenceController mController;
		boolean mCallbackInvoked;
		private AmbientDisplayAlwaysOnPreferenceController mController;
		private boolean mCallbackInvoked;

		@Before
		public void setUp() throws Exception {
		MockitoAnnotations.initMocks(this);
		mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
		() -> { mCallbackInvoked = true; });
		() -> {
		mCallbackInvoked = true;
		});
		}

		@Test
		@@ -104,34 +113,40 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {

		@Test
		public void isAvailable_available() throws Exception {
		when(mConfig.alwaysOnAvailableForUser(anyInt()))
		.thenReturn(true);
		mController = spy(mController);
		doReturn(true).when(mController).alwaysOnAvailableForUser(any());

		assertThat(mController.isAvailable()).isTrue();
		}

		@Test
		public void isAvailable_unavailable() throws Exception {
		when(mConfig.alwaysOnAvailableForUser(anyInt()))
		.thenReturn(false);
		mController = spy(mController);
		doReturn(false).when(mController).alwaysOnAvailableForUser(any());


		assertThat(mController.isAvailable()).isFalse();
		}

		@Test
		public void testPreferenceController_ProperResultPayloadType() {
		mController = spy(mController);
		doReturn(false).when(mController).alwaysOnAvailableForUser(any());
		assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
		}

		@Test
		@Config(shadows = ShadowSecureSettings.class)
		public void testSetValue_updatesCorrectly() {
		int newValue = 1;
		ContentResolver resolver = mContext.getContentResolver();
		Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0);
		mController = spy(mController);
		doReturn(false).when(mController).alwaysOnAvailableForUser(any());
		final int newValue = 1;
		final ContentResolver resolver = mContext.getContentResolver();
		Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0 /* value */);

		((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
		int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 1);
		final int updatedValue = Settings.Secure.getInt(resolver,
		Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);

		assertThat(updatedValue).isEqualTo(newValue);
		}
		@@ -139,11 +154,13 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
		@Test
		@Config(shadows = ShadowSecureSettings.class)
		public void testGetValue_correctValueReturned() {
		int currentValue = 1;
		ContentResolver resolver = mContext.getContentResolver();
		mController = spy(mController);
		doReturn(false).when(mController).alwaysOnAvailableForUser(any());
		final int currentValue = 1;
		final ContentResolver resolver = mContext.getContentResolver();
		Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);

		int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
		final int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);

		assertThat(newValue).isEqualTo(currentValue);
		}