Merge "Remove extra IndexProviders that provided bad data."

This commit is contained in:
TreeHugger Robot
2017-02-15 21:44:14 +00:00
committed by Android (Google) Code Review
15 changed files with 4 additions and 253 deletions

View File

@@ -93,23 +93,4 @@ public class DoubleTapPowerPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new DoubleTapPowerPreferenceController(context, null);
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new DoubleTapPowerPreferenceController(context, null);
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("camera_double_tap_power_gesture_disabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(0)).isEqualTo(true);
assertThat(payload.valueMap.get(1)).isEqualTo(false);
}
}

View File

@@ -81,19 +81,4 @@ public class DoubleTapScreenPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_double_tap");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

View File

@@ -113,19 +113,4 @@ public class DoubleTwistPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("camera_double_twist_to_flip_enabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

View File

@@ -83,19 +83,4 @@ public class PIckupGesturePreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_pick_up");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

View File

@@ -89,19 +89,4 @@ public class SwipeToNotificationPreferenceControllerTest {
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("system_navigation_keys_enabled");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

View File

@@ -72,14 +72,6 @@ public class DatabaseIndexingUtilsTest {
assertThat(map).isNull();
}
@Test
public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsNotNull() {
String className = "com.android.settings.gestures.GestureSettings";
Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
assertThat(map).isNotNull();
}
@Test
public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
String className = "com.android.settings.DisplaySettings";
@@ -96,7 +88,7 @@ public class DatabaseIndexingUtilsTest {
}
@Test
public void testGetPayloadFromMap_MatchingKey_ReturnsPayloa() {
public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() {
final String key = "key";
PreferenceController prefController = new PreferenceController(mContext) {
@Override