Merge "Disable user control of color mode depending on Accessibility" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c9bd31b2f8
@@ -16,8 +16,10 @@
|
||||
package com.android.settings.display;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
@@ -32,6 +34,7 @@ import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.LayoutPreference;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.widget.RadioButtonPreference;
|
||||
import com.android.settingslib.widget.CandidateInfo;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -39,11 +42,11 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@@ -54,11 +57,14 @@ public class ColorModePreferenceFragmentTest {
|
||||
@Mock
|
||||
private ColorDisplayController mController;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mFragment = spy(new ColorModePreferenceFragment());
|
||||
mFragment = spy(new ColorModePreferenceFragmentTestable(mScreen));
|
||||
ReflectionHelpers.setField(mFragment, "mController", mController);
|
||||
}
|
||||
|
||||
@@ -86,7 +92,7 @@ public class ColorModePreferenceFragmentTest {
|
||||
|
||||
@Test
|
||||
public void getKey_natural() {
|
||||
Mockito.when(mController.getColorMode())
|
||||
when(mController.getColorMode())
|
||||
.thenReturn(ColorDisplayController.COLOR_MODE_NATURAL);
|
||||
|
||||
assertThat(mFragment.getDefaultKey())
|
||||
@@ -95,7 +101,7 @@ public class ColorModePreferenceFragmentTest {
|
||||
|
||||
@Test
|
||||
public void getKey_boosted() {
|
||||
Mockito.when(mController.getColorMode())
|
||||
when(mController.getColorMode())
|
||||
.thenReturn(ColorDisplayController.COLOR_MODE_BOOSTED);
|
||||
|
||||
assertThat(mFragment.getDefaultKey())
|
||||
@@ -104,7 +110,7 @@ public class ColorModePreferenceFragmentTest {
|
||||
|
||||
@Test
|
||||
public void getKey_saturated() {
|
||||
Mockito.when(mController.getColorMode())
|
||||
when(mController.getColorMode())
|
||||
.thenReturn(ColorDisplayController.COLOR_MODE_SATURATED);
|
||||
|
||||
assertThat(mFragment.getDefaultKey())
|
||||
@@ -141,15 +147,64 @@ public class ColorModePreferenceFragmentTest {
|
||||
|
||||
@Test
|
||||
public void addStaticPreferences_shouldAddPreviewImage() {
|
||||
PreferenceScreen mockPreferenceScreen = Mockito.mock(PreferenceScreen.class);
|
||||
LayoutPreference mockPreview = Mockito.mock(LayoutPreference.class);
|
||||
PreferenceScreen mockPreferenceScreen = mock(PreferenceScreen.class);
|
||||
LayoutPreference mockPreview = mock(LayoutPreference.class);
|
||||
|
||||
ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
|
||||
|
||||
mFragment.configureAndInstallPreview(mockPreview, mockPreferenceScreen);
|
||||
Mockito.verify(mockPreview, times(1)).setSelectable(false);
|
||||
Mockito.verify(mockPreferenceScreen, times(1)).addPreference(preferenceCaptor.capture());
|
||||
verify(mockPreview, times(1)).setSelectable(false);
|
||||
verify(mockPreferenceScreen, times(1)).addPreference(preferenceCaptor.capture());
|
||||
|
||||
assertThat(preferenceCaptor.getValue()).isEqualTo(mockPreview);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onAccessibilityTransformChanged_toggles() {
|
||||
final int radioPrefsCount = 3;
|
||||
List<RadioButtonPreference> radioPrefs = new ArrayList<>();
|
||||
for (int i = 0; i < radioPrefsCount; i++) {
|
||||
radioPrefs.add(mock(RadioButtonPreference.class));
|
||||
}
|
||||
|
||||
when(mScreen.getPreferenceCount()).thenReturn(radioPrefs.size());
|
||||
when(mScreen.getPreference(anyInt())).thenAnswer(invocation -> {
|
||||
final Object[] args = invocation.getArguments();
|
||||
return radioPrefs.get((int) args[0]);
|
||||
});
|
||||
|
||||
mFragment.onAccessibilityTransformChanged(true /* state */);
|
||||
for (int i = 0; i < radioPrefsCount; i++) {
|
||||
verify(radioPrefs.get(i)).setEnabled(false);
|
||||
}
|
||||
|
||||
mFragment.onAccessibilityTransformChanged(false /* state */);
|
||||
for (int i = 0; i < radioPrefsCount; i++) {
|
||||
verify(radioPrefs.get(i)).setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
private static class ColorModePreferenceFragmentTestable
|
||||
extends ColorModePreferenceFragment {
|
||||
|
||||
private final PreferenceScreen mPreferenceScreen;
|
||||
|
||||
private ColorModePreferenceFragmentTestable(PreferenceScreen screen) {
|
||||
mPreferenceScreen = screen;
|
||||
}
|
||||
|
||||
/**
|
||||
* A method to return a mock PreferenceScreen.
|
||||
* A real ColorModePreferenceFragment calls super.getPreferenceScreen() to get its
|
||||
* PreferenceScreen handle, which internally dereferenced a PreferenceManager. But in this
|
||||
* test scenario, the PreferenceManager object is uninitialized, so we need to supply the
|
||||
* PreferenceScreen directly.
|
||||
*
|
||||
* @return a mock PreferenceScreen
|
||||
*/
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mPreferenceScreen;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user