Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81
am: 7bdfb34b7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028 Change-Id: I7b9204f3ae765b442f8dbedaac102a4fd9bc2846 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -455,6 +455,36 @@ public class AddAppNetworksFragmentTest {
|
||||
AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void uiConfigurationItem_putCrToDisplayedSsid_shouldRemoveCr() {
|
||||
String testSsid = "\r" + FAKE_NEW_WPA_SSID + "\r";
|
||||
|
||||
AddAppNetworksFragment.UiConfigurationItem item =
|
||||
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
|
||||
|
||||
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void uiConfigurationItem_putLfToDisplayedSsid_shouldRemoveLf() {
|
||||
String testSsid = "\n" + FAKE_NEW_WPA_SSID + "\n";
|
||||
|
||||
AddAppNetworksFragment.UiConfigurationItem item =
|
||||
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
|
||||
|
||||
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void uiConfigurationItem_putCrLfToDisplayedSsid_shouldRemoveCrLf() {
|
||||
String testSsid = "\r\n" + FAKE_NEW_WPA_SSID + "\r\n";
|
||||
|
||||
AddAppNetworksFragment.UiConfigurationItem item =
|
||||
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
|
||||
|
||||
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
|
||||
}
|
||||
|
||||
private void setUpOneScannedNetworkWithScanedLevel4() {
|
||||
final ArrayList list = new ArrayList<>();
|
||||
list.add(mWifiEntry);
|
||||
|
Reference in New Issue
Block a user