Merge "Use BluetoothDevice.ACCESS_* instead of CachedBluetoothDevice.ACCESS_*"

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java

@@ -31,8 +31,8 @@ import android.content.Context;
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settings.testutils.shadow.ShadowBluetoothDevice;
 import com.android.settingslib.bluetooth.A2dpProfile;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
 import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -55,7 +55,7 @@ import androidx.preference.PreferenceCategory;
 import androidx.preference.SwitchPreference;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowBluetoothDevice.class)
+@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowBluetoothDevice.class})
 public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
 
     private BluetoothDetailsProfilesController mController;
@@ -290,8 +290,7 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
     @Test
     public void pbapProfileStartsEnabled() {
         setupDevice(makeDefaultDeviceConfig());
-        when(mCachedDevice.getPhonebookPermissionChoice())
-            .thenReturn(CachedBluetoothDevice.ACCESS_ALLOWED);
+        mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
         PbapServerProfile psp = mock(PbapServerProfile.class);
         when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
         when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -306,14 +305,14 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
 
         pref.performClick();
         assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
+        assertThat(mDevice.getPhonebookAccessPermission())
+                .isEqualTo(BluetoothDevice.ACCESS_REJECTED);
     }
 
     @Test
     public void pbapProfileStartsDisabled() {
         setupDevice(makeDefaultDeviceConfig());
-        when(mCachedDevice.getPhonebookPermissionChoice())
-            .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
+        mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
         PbapServerProfile psp = mock(PbapServerProfile.class);
         when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
         when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -328,7 +327,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
 
         pref.performClick();
         assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+        assertThat(mDevice.getPhonebookAccessPermission())
+                .isEqualTo(BluetoothDevice.ACCESS_ALLOWED);
     }
 
     @Test
@@ -338,8 +338,7 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
         when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map);
         when(mProfileManager.getMapProfile()).thenReturn(mapProfile);
         when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile);
-        when(mCachedDevice.getMessagePermissionChoice())
-            .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
+        mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);
         showScreen(mController);
         List<SwitchPreference> switches = getProfileSwitches(false);
         assertThat(switches.size()).isEqualTo(1);
@@ -349,7 +348,7 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
 
         pref.performClick();
         assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
-        verify(mCachedDevice).setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+        assertThat(mDevice.getMessageAccessPermission()).isEqualTo(BluetoothDevice.ACCESS_ALLOWED);
     }
 
     private A2dpProfile addMockA2dpProfile(boolean preferred, boolean supportsHighQualityAudio,

tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 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.testutils.shadow;
+
+import android.bluetooth.BluetoothDevice;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(value = BluetoothDevice.class, inheritImplementationMethods = true)
+public class ShadowBluetoothDevice extends org.robolectric.shadows.ShadowBluetoothDevice {
+
+    private int mMessageAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+    private int mPhonebookAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+    private int mSimAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+
+    @Implementation
+    public void setMessageAccessPermission(int value) {
+        mMessageAccessPermission = value;
+    }
+
+    @Implementation
+    public int getMessageAccessPermission() {
+        return mMessageAccessPermission;
+    }
+
+    @Implementation
+    public void setPhonebookAccessPermission(int value) {
+        mPhonebookAccessPermission = value;
+    }
+
+    @Implementation
+    public int getPhonebookAccessPermission() {
+        return mPhonebookAccessPermission;
+    }
+
+    @Implementation
+    public void setSimAccessPermission(int value) {
+        mSimAccessPermission = value;
+    }
+
+    @Implementation
+    public int getSimAccessPermission() {
+        return mSimAccessPermission;
+    }
+}