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

Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669

Browse Source 
am: e54e3de80c

Change-Id: Ifa1964b6d9d6b32e8b2fc440c40f2431ddcc7b43
This commit is contained in:
Kevin Chyn
2017-08-11 03:11:27 +00:00
committed by android-build-merger
parent 65e557754e e54e3de80c
commit a7144ae5b2
6 changed files with 46 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java → tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
View File

@@ -16,9 +16,6 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@@ -26,17 +23,16 @@ import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import android.provider.Settings.Secure;
import com.android.settings.TestConfig;
import com.android.settings.display.AutoBrightnessPreferenceController;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,16 +41,15 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AssistGesturePreferenceControllerTest {
public class AssistGestureSettingsPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFactory;
private AssistGesturePreferenceController mController;
private AssistGestureSettingsPreferenceController mController;
private static final String KEY_ASSIST = "gesture_assist";
@@ -63,7 +58,8 @@ public class AssistGesturePreferenceControllerTest {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new AssistGesturePreferenceController(mContext, null, KEY_ASSIST, false);
mController = new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST,
false);
}
@Test
@@ -79,32 +75,12 @@ public class AssistGesturePreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
final Context context = ShadowApplication.getInstance().getApplicationContext();
Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 1);
mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
assertThat(mController.isSwitchPrefEnabled()).isTrue();
}
@Test
public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
// Set the setting to be disabled.
final Context context = ShadowApplication.getInstance().getApplicationContext();
Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 0);
mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
final Context context = RuntimeEnvironment.application;
AssistGesturePreferenceController controller =
new AssistGesturePreferenceController(context, null /* lifecycle */, KEY_ASSIST,
false /* assistOnly */);
AssistGestureSettingsPreferenceController controller =
new AssistGestureSettingsPreferenceController(context, null /* lifecycle */,
KEY_ASSIST, false /* assistOnly */);
ResultPayload payload = controller.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}

7
tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
View File

@@ -61,13 +61,6 @@ public class AssistGestureSettingsTest {
.isEqualTo(R.xml.assist_gesture_settings);
}
@Test
public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers =
mSettings.getPreferenceControllers(mContext);
assertThat(controllers.isEmpty()).isFalse();
}
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =