Introduce BluetoothAudioCodecPreferenceController

- Create new BluetoothAudioCodecPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I90a0e58328196315fccbecd6d46531b4f0fcaef1
This commit is contained in:
jeffreyhuang
2017-10-12 16:39:26 -07:00
parent 32b0f1d486
commit 0ef326f365
9 changed files with 325 additions and 47 deletions

View File

@@ -24,11 +24,17 @@ public class BluetoothCodecConfig {
public static final int SAMPLE_RATE_NONE = 0;
public static final int SAMPLE_RATE_48000 = 0x1 << 1;
public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
public static final int SOURCE_CODEC_TYPE_AAC = 1;
public static final int CODEC_PRIORITY_DEFAULT = 0;
public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;
public static final int BITS_PER_SAMPLE_NONE = 0;
public static final int CHANNEL_MODE_NONE = 0;
public int getSampleRate() {
return 0;
}
public int getCodecType() {
return 0;
}
}

View File

@@ -74,7 +74,7 @@ public class AbstractBluetoothA2dpPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mLifecycle = new Lifecycle();
mController = spy(new AbstractBluetoothA2dpPreferenceControllerImpl(mContext, mLifecycle,
new Object(), mBluetoothA2dpConfigStore));
mBluetoothA2dpConfigStore));
doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig();
doNothing().when(mController).setCodecConfigPreference(any());
when(mBluetoothA2dpConfigStore.createCodecConfig()).thenReturn(mBluetoothCodecConfig);
@@ -138,8 +138,8 @@ public class AbstractBluetoothA2dpPreferenceControllerTest {
AbstractBluetoothA2dpPreferenceController {
public AbstractBluetoothA2dpPreferenceControllerImpl(Context context,
Lifecycle lifecycle, Object bluetoothA2dpLock, BluetoothA2dpConfigStore store) {
super(context, lifecycle, bluetoothA2dpLock, store);
Lifecycle lifecycle, BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override

View File

@@ -0,0 +1,117 @@
/*
* Copyright (C) 2017 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.development;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioCodecPreferenceControllerTest {
@Mock
private BluetoothCodecConfig mBluetoothCodecConfig;
@Mock
private ListPreference mPreference;
@Mock
private PreferenceScreen mScreen;
@Mock
private BluetoothA2dpConfigStore mBluetoothA2dpConfigStore;
/**
* 0: Use System Selection (Default)
* 1: SBC
* 2: AAC
* 3: Qualcomm aptX audio
* 4: Qualcomm aptX HD audio
* 5: LDAC
* 6: Enable Optional Codecs
* 7: Disable Optional Codecs
*/
private String[] mListValues;
private Context mContext;
private BluetoothAudioCodecPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = spy(new BluetoothAudioCodecPreferenceController(mContext, new Lifecycle(),
mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}
@Test
public void writeConfigurationValues_option2_shouldWriteOption2ToSharedStore() {
when(mPreference.findIndexOfValue(mListValues[2])).thenReturn(2);
mController.writeConfigurationValues(mListValues[2]);
verify(mBluetoothA2dpConfigStore).setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
verify(mBluetoothA2dpConfigStore).setCodecPriority(
BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST);
}
@Test
public void writeConfigurationValues_default_shouldSetDefaultPriority() {
when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
mController.writeConfigurationValues(mListValues[0]);
verify(mBluetoothA2dpConfigStore).setCodecPriority(
BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT);
}
@Test
public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
when(mBluetoothCodecConfig.getCodecType()).thenReturn(
BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
assertThat(index).isEqualTo(2);
}
@Test
public void getCurrentA2dpSettingIndex_unknownOption_shouldReturnDefault() {
when(mBluetoothCodecConfig.getCodecType()).thenReturn(1381391835);
final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
assertThat(index).isEqualTo(0);
}
}

View File

@@ -70,7 +70,7 @@ public class BluetoothAudioSampleRatePreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mLifecycle = new Lifecycle();
mController = spy(new BluetoothAudioSampleRatePreferenceController(mContext, mLifecycle,
new Object(), mBluetoothA2dpConfigStore));
mBluetoothA2dpConfigStore));
mListValues = mController.getListValues();
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);