Merge "Fix robo test build error"

This commit is contained in:
TreeHugger Robot
2020-01-20 06:58:22 +00:00
committed by Android (Google) Code Review

View File

@@ -18,6 +18,7 @@ package com.android.settings.development.bluetooth;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -114,9 +115,8 @@ public class BluetoothCodecDialogPreferenceControllerTest {
mController.onBluetoothServiceConnected(mBluetoothA2dp); mController.onBluetoothServiceConnected(mBluetoothA2dp);
mController.writeConfigurationValues(1); mController.writeConfigurationValues(1);
//TODO(b/147861843): mark this test to fix build break first. verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecType(
/*verify(mBluetoothA2dpConfigStore) BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);
.setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC);*/
mController.writeConfigurationValues(2); mController.writeConfigurationValues(2);
verify(mBluetoothA2dpConfigStore).setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC); verify(mBluetoothA2dpConfigStore).setCodecType(BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC);
@@ -142,14 +142,14 @@ public class BluetoothCodecDialogPreferenceControllerTest {
mController.onBluetoothServiceConnected(mBluetoothA2dp); mController.onBluetoothServiceConnected(mBluetoothA2dp);
mController.writeConfigurationValues(2); mController.writeConfigurationValues(2);
//TODO(b/147861843): mark this test to fix build break first. verify(mBluetoothA2dpConfigStore, atLeastOnce()).setCodecPriority(
/*verify(mBluetoothA2dpConfigStore).setCodecPriority( BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST);
BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST);*/ verify(mBluetoothA2dpConfigStore, atLeastOnce()).setSampleRate(
verify(mBluetoothA2dpConfigStore).setSampleRate(BluetoothCodecConfig.SAMPLE_RATE_88200); BluetoothCodecConfig.SAMPLE_RATE_88200);
verify(mBluetoothA2dpConfigStore).setBitsPerSample(BluetoothCodecConfig.BITS_PER_SAMPLE_24); verify(mBluetoothA2dpConfigStore, atLeastOnce()).setBitsPerSample(
//TODO(b/147861843): mark this test to fix build break first. BluetoothCodecConfig.BITS_PER_SAMPLE_24);
/*verify(mBluetoothA2dpConfigStore) verify(mBluetoothA2dpConfigStore, atLeastOnce()).setChannelMode(
.setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_STEREO);*/ BluetoothCodecConfig.CHANNEL_MODE_STEREO);
} }
@Test @Test