Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change AccessPointPreference key generation to match AccessPoint." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-01 21:29:41 +00:00
committed by Android (Google) Code Review
parent 63c5cd7fb0 2b35b512e3
commit c3fbddd712
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java
View File

@@ -76,10 +76,10 @@ public class AccessPointPreference extends Preference {
public static String generatePreferenceKey(AccessPoint accessPoint) {
StringBuilder builder = new StringBuilder();
if (TextUtils.isEmpty(accessPoint.getBssid())) {
builder.append(accessPoint.getSsidStr());
} else {
if (TextUtils.isEmpty(accessPoint.getSsidStr())) {
builder.append(accessPoint.getBssid());
} else {
builder.append(accessPoint.getSsidStr());
}
builder.append(',').append(accessPoint.getSecurity());

12
packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java
View File

@@ -36,26 +36,28 @@ public class AccessPointPreferenceTest {
private Context mContext = RuntimeEnvironment.application;
@Test
public void generatePreferenceKey_shouldReturnSsidPlusSecurity() {
public void generatePreferenceKey_returnsSsidPlusSecurity() {
String ssid = "ssid";
String bssid = "00:00:00:00:00:00";
int security = AccessPoint.SECURITY_WEP;
String expectedKey = ssid + ',' + security;
TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext);
builder.setSsid(ssid).setSecurity(security);
builder.setBssid(bssid).setSsid(ssid).setSecurity(security);
assertThat(AccessPointPreference.generatePreferenceKey(builder.build()))
.isEqualTo(expectedKey);
}
@Test
public void generatePreferenceKey_shouldReturnBssidPlusSecurity() {
String bssid = "bssid";
public void generatePreferenceKey_emptySsidReturnsBssidPlusSecurity() {
String ssid = "";
String bssid = "00:00:00:00:00:00";
int security = AccessPoint.SECURITY_WEP;
String expectedKey = bssid + ',' + security;
TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext);
builder.setBssid(bssid).setSecurity(security);
builder.setBssid(bssid).setSsid(ssid).setSecurity(security);
assertThat(AccessPointPreference.generatePreferenceKey(builder.build()))
.isEqualTo(expectedKey);