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

No-op refactor on EmergencyGesturePreferenceController.

Browse Source 
Move custom intent launching logic into a separate controller
(EmergencyGestureEntrypointPreferenceController).

This is in preparation of a mini-IA refresh and fixing a search
bug. The custom intent logic is only needed by the entrypoint
pref, and putting in the gesture PrefControler makes any fix
hard to implement.

Bug: 171067360
Bug: 172609395
Test: RunSettingsRoboTests
Change-Id: I1e26393872bfada98db80a1cc33e3e13dacb086b
This commit is contained in:
Fan Zhang
2020-11-12 14:15:20 -08:00
parent 76eb401911
commit d7c833278b
9 changed files with 314 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,109 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.gestures;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class EmergencyGestureEntrypointPreferenceControllerTest {
private static final String TEST_PKG_NAME = "test_pkg";
private static final String TEST_CLASS_NAME = "name";
private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
.setPackage(TEST_PKG_NAME);
private Context mContext;
private ShadowPackageManager mPackageManager;
private EmergencyGestureEntrypointPreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button";
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
}
@After
public void tearDown() {
SettingsShadowResources.reset();
}
@Test
public void constructor_hasCustomPackageConfig_shouldSetIntent() {
final ResolveInfo info = new ResolveInfo();
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = TEST_PKG_NAME;
info.activityInfo.name = TEST_CLASS_NAME;
mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
SettingsShadowResources.overrideResource(
R.string.emergency_gesture_settings_package,
TEST_PKG_NAME);
mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
assertThat(mController.mIntent).isNotNull();
}
@Test
public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}

59
tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
View File

@@ -16,7 +16,8 @@
package com.android.settings.gestures;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
@@ -24,9 +25,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.provider.Settings;
import androidx.test.core.app.ApplicationProvider;
@@ -39,22 +37,14 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class EmergencyGesturePreferenceControllerTest {
private static final String TEST_PKG_NAME = "test_pkg";
private static final String TEST_CLASS_NAME = "name";
private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
.setPackage(TEST_PKG_NAME);
private Context mContext;
private ContentResolver mContentResolver;
private ShadowPackageManager mPackageManager;
private EmergencyGesturePreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button";
@@ -62,7 +52,6 @@ public class EmergencyGesturePreferenceControllerTest {
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
}
@@ -72,43 +61,21 @@ public class EmergencyGesturePreferenceControllerTest {
}
@Test
public void constructor_hasCustomPackageConfig_shouldSetIntent() {
final ResolveInfo info = new ResolveInfo();
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = TEST_PKG_NAME;
info.activityInfo.name = TEST_CLASS_NAME;
mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
SettingsShadowResources.overrideResource(
R.string.emergency_gesture_settings_package,
TEST_PKG_NAME);
mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.mIntent).isNotNull();
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_configIsFalse_shouldReturnFalse() {
public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@@ -130,17 +97,7 @@ public class EmergencyGesturePreferenceControllerTest {
}
@Test
public void isSliceableCorrectKey_returnsTrue() {
final EmergencyGesturePreferenceController controller =
new EmergencyGesturePreferenceController(mContext, PREF_KEY);
assertThat(controller.isSliceable()).isTrue();
public void isSliceable_returnsFalse() {
assertThat(mController.isSliceable()).isFalse();
}
@Test
public void isSliceableIncorrectKey_returnsFalse() {
final DoubleTapPowerPreferenceController controller =
new DoubleTapPowerPreferenceController(mContext, "bad_key");
assertThat(controller.isSliceable()).isFalse();
}
}