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

Revert "Add ability to show/hide accessibility_shortcut_preference."

Browse Source 
This reverts commit 4983dc1227.

Reason for revert: Moving logic somewhere else.

Change-Id: I2f2e3ac6545e8599de32afb1fe6f6d108601e37d
This commit is contained in:
Ben Lin
2018-02-16 22:23:03 +00:00
parent 970bacd8cb
commit 463c9a07f0
5 changed files with 7 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -16,106 +16,38 @@
package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccessibilitySettingsTest {
private Context mContext;
private AccessibilitySettings mFragment;
private boolean mAccessibilityShortcutPreferenceRemoved;
private boolean mColorInversionPreferenceRemoved;
private boolean mColorCorrectionPreferenceRemoved;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mFragment = new AccessibilitySettings() {
@Override
public Context getContext() {
return mContext;
}
@Override
protected boolean removePreference(String key) {
if (AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE.equals(key)) {
mAccessibilityShortcutPreferenceRemoved = true;
return true;
}
if (AccessibilitySettings.TOGGLE_INVERSION_PREFERENCE.equals(key)) {
mColorInversionPreferenceRemoved = true;
return true;
}
if (AccessibilitySettings.DISPLAY_DALTONIZER_PREFERENCE_SCREEN.equals(key)) {
mColorCorrectionPreferenceRemoved = true;
return true;
}
return false;
}
};
}
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
.getNonIndexableKeys(context);
final List<String> keys = new ArrayList<>();
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings));
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
assertThat(keys).containsAllIn(niks);
}
@Test
public void testAccessibilityShortcutPreference_byDefault_shouldBeShown() {
final Preference preference = new Preference(mContext);
mFragment.checkAccessibilityShortcutVisibility(preference);
assertThat(mAccessibilityShortcutPreferenceRemoved).isFalse();
}
@Test
@Config(qualifiers = "mcc999")
public void testAccessibilityShortcutPreference_ifDisabled_shouldNotBeShown() {
final Preference preference = new Preference(mContext);
mFragment.checkAccessibilityShortcutVisibility(preference);
assertThat(mAccessibilityShortcutPreferenceRemoved).isTrue();
}
@Test
@Config(qualifiers = "mcc999")
public void testNonIndexableKeys_ifAccessibilityShortcutNotVisible_containsKey() {
final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(niks).contains(AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE);
}
@Test
public void testColorInversionPreference_byDefault_shouldBeShown() {
final Preference preference = new Preference(mContext);