Merge "Fix test string in BluetoothSwitchPreferenceControllerTest" into main

This commit is contained in:
Haijie Hong
2023-11-29 08:00:27 +00:00
committed by Android (Google) Code Review

View File

@@ -33,7 +33,6 @@ import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -45,7 +44,7 @@ import org.robolectric.RuntimeEnvironment;
public class BluetoothSwitchPreferenceControllerTest {
private static final String BLUETOOTH_INFO_STRING = "When Bluetooth is turned on, your device"
+ " can communicate with other nearby Bluetooth devices.";
+ " can communicate with other nearby Bluetooth devices";
@Mock
private RestrictionUtils mRestrictionUtils;
@Mock
@@ -83,7 +82,6 @@ public class BluetoothSwitchPreferenceControllerTest {
assertThat(TextUtils.equals(mFooterPreference.getTitle(), text)).isTrue();
}
@Ignore("b/313014781")
@Test
public void updateText_bluetoothOffScanningOff() {
Settings.Global.putInt(mContext.getContentResolver(),
@@ -93,7 +91,6 @@ public class BluetoothSwitchPreferenceControllerTest {
assertThat(mFooterPreference.getTitle()).isEqualTo(BLUETOOTH_INFO_STRING);
}
@Ignore("b/313014781")
@Test
public void updateText_bluetoothOnScanningOff() {
Settings.Global.putInt(mContext.getContentResolver(),
@@ -103,7 +100,6 @@ public class BluetoothSwitchPreferenceControllerTest {
assertThat(mFooterPreference.getTitle()).isEqualTo(BLUETOOTH_INFO_STRING);
}
@Ignore("b/313014781")
@Test
public void updateText_bluetoothOnScanningOn() {
Settings.Global.putInt(mContext.getContentResolver(),