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

Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev

Browse Source 
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
This commit is contained in:
Andrew Sapperstein
2017-08-02 06:07:23 +00:00
committed by android-build-merger
parent ea39f74a42 3daceaec5f
commit 0f13525842
3 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
View File

@@ -40,11 +40,12 @@ import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DoubleTwistPreferenceControllerTest {
@@ -96,14 +97,16 @@ public class DoubleTwistPreferenceControllerTest {
}
@Test
@Config(shadows = {ShadowSecureSettings.class})
@Config(shadows = {
ShadowDoubleTwistPreferenceController.class,
ShadowSecureSettings.class})
public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
final int managedId = 2;
ShadowSecureSettings.putIntForUser(
null, Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
DoubleTwistPreferenceController controller =
spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
doReturn(managedId).when(controller).getManagedProfileUserId();
ShadowDoubleTwistPreferenceController.setManagedProfileId(managedId);
// enable the gesture
controller.onPreferenceChange(null, true);

28
tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java Normal file
View File

@@ -0,0 +1,28 @@
package com.android.settings.testutils.shadow;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.gestures.DoubleTwistPreferenceController;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@Implements(DoubleTwistPreferenceController.class)
public class ShadowDoubleTwistPreferenceController {
private static int sManagedProfileId = UserHandle.USER_NULL;
@Implementation
public static boolean isGestureAvailable(Context context) {
return true;
}
@Implementation
public static int getManagedProfileId(UserManager userManager) {
return sManagedProfileId;
}
public static void setManagedProfileId(int managedProfileId) {
sManagedProfileId = managedProfileId;
}
}