Merge "Revert "Ignore two broken tests""

This commit is contained in:
TreeHugger Robot
2020-02-18 23:05:27 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 4 deletions

View File

@@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -99,7 +98,6 @@ public class AbstractBluetoothA2dpPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void updateState_option2Set_shouldUpdateToOption2() { public void updateState_option2Set_shouldUpdateToOption2() {
when(mBluetoothCodecConfig.getSampleRate()).thenReturn( when(mBluetoothCodecConfig.getSampleRate()).thenReturn(
BluetoothCodecConfig.SAMPLE_RATE_48000); BluetoothCodecConfig.SAMPLE_RATE_48000);

View File

@@ -35,7 +35,6 @@ import com.android.settings.development.BluetoothA2dpConfigStore;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -102,7 +101,6 @@ public class AbstractBluetoothDialogPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void onIndexUpdated_checkFlow() { public void onIndexUpdated_checkFlow() {
mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null); mCodecStatus = new BluetoothCodecStatus(mCodecConfigAAC, null, null);
when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus); when(mBluetoothA2dp.getCodecStatus(null)).thenReturn(mCodecStatus);