commit 3d1acfeab7209ced545aba81af4856ff12834605
author jeffreyhuang <jeffreyhuang@google.com> Thu Nov 30 10:35:58 2017 -0800
committer jeffreyhuang <jeffreyhuang@google.com> Thu Nov 30 10:35:58 2017 -0800
tree 0b6761a62e34cb024b6185e9baba3e2ada6bfeae
parent 7ec34c1781ade567d08d7f589b88d6cf0f759e1a

Update PickupGesturePrefCtrlTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ia322a8c98760c1074732369d084e6a57a29903af

src/com/android/settings/gestures/PickupGesturePreferenceController.java

diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index 314cbc3..02107c1 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -24,6 +24,7 @@
 import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.settings.R;
@@ -90,7 +91,7 @@
 
     @Override
     public boolean canHandleClicks() {
-        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+        return pulseOnPickupCanBeModified();
     }
 
     @Override
@@ -102,4 +103,9 @@
         return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
                 ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
     }
+
+    @VisibleForTesting
+    boolean pulseOnPickupCanBeModified() {
+        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+    }
 }

tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
index 8757a65..ffd4928 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
@@ -18,6 +18,8 @@
 
 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.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
@@ -46,7 +48,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
         SettingsShadowResources.class
 })
 public class PickupGesturePreferenceControllerTest {
@@ -105,14 +107,16 @@
 
     @Test
     public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(true);
+        mController = spy(mController);
+        doReturn(true).when(mController).pulseOnPickupCanBeModified();
 
         assertThat(mController.canHandleClicks()).isTrue();
     }
 
     @Test
     public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
-        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(false);
+        mController = spy(mController);
+        doReturn(false).when(mController).pulseOnPickupCanBeModified();
 
         assertThat(mController.canHandleClicks()).isFalse();
     }