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

Add Adaptive brightness as an inline result in Search

Browse Source 
Bug: 34740449
Test: make RunSettingsRoboTests
Change-Id: I71acdcc04780a76263171a9d312d88a1eb61624a
This commit is contained in:
Matthew Fritze
2017-01-26 14:37:48 -08:00
parent a1bae0ad7e
commit 516b0f1b83
5 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
View File

@@ -20,6 +20,9 @@ import android.content.Context;
import android.provider.Settings;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.gestures.DoubleTapPowerPreferenceController;
import com.android.settings.search2.InlineSwitchPayload;
import com.android.settings.search2.ResultPayload;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +30,7 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
@@ -64,4 +68,23 @@ public class AutoBrightnessPreferenceControllerTest {
SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
assertThat(mode).isEqualTo(SCREEN_BRIGHTNESS_MODE_MANUAL);
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new AutoBrightnessPreferenceController(context);
ResultPayload payload = mController.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testPreferenceController_CorrectPayload() {
final Context context = ShadowApplication.getInstance().getApplicationContext();
mController = new AutoBrightnessPreferenceController(context);
InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload();
assertThat(payload.settingsUri).isEqualTo("screen_brightness_mode");
assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SYSTEM);
assertThat(payload.valueMap.get(1)).isEqualTo(true);
assertThat(payload.valueMap.get(0)).isEqualTo(false);
}
}

15
tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
View File

@@ -24,6 +24,7 @@ import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceController;
import com.android.settings.display.AutoBrightnessPreferenceController;
import com.android.settings.gestures.DoubleTapPowerPreferenceController;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.DoubleTwistPreferenceController;
@@ -81,19 +82,11 @@ public class DatabaseIndexingUtilsTest {
@Test
public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() {
String className = "com.android.settings.gestures.GestureSettings";
String className = "com.android.settings.DisplaySettings";
Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext);
assertThat(map.get("gesture_double_twist"))
.isInstanceOf(DoubleTwistPreferenceController.class);
assertThat(map.get("gesture_swipe_down_fingerprint"))
.isInstanceOf(SwipeToNotificationPreferenceController.class);
assertThat(map.get("gesture_double_tap_screen"))
.isInstanceOf(DoubleTapScreenPreferenceController.class);
assertThat(map.get("gesture_pick_up"))
.isInstanceOf(PickupGesturePreferenceController.class);
assertThat(map.get("gesture_double_tap_power"))
.isInstanceOf(DoubleTapPowerPreferenceController.class);
assertThat(map.get("auto_brightness"))
.isInstanceOf(AutoBrightnessPreferenceController.class);
}
@Test