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

Use new WifiSsid creator methods in unit tests

Browse Source 
Use the new WifiSsid.fromString() instead of
WifiSsid.createFromAsciiEncoded() in SettingsLib tests and
WifiNetworkScoreCacheTest

Bug: 136480579
Test: atest AccessPointTest WifiTrackerTest WifiNetworkScoreCacheTest
Change-Id: Ic8d862d24626da73fe1664b871f4412e700ce666
This commit is contained in:
Quang Luong
2021-10-11 09:39:41 -07:00
parent 21223c9bb8
commit 8a0ac23cab
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
View File

@@ -130,7 +130,7 @@ public class AccessPointTest {
mContext = InstrumentationRegistry.getTargetContext();
mMaxSignalLevel = mContext.getSystemService(WifiManager.class).getMaxSignalLevel();
mWifiInfo = new WifiInfo();
mWifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID));
mWifiInfo.setSSID(WifiSsid.fromString(TEST_SSID));
mWifiInfo.setBSSID(TEST_BSSID);
mScanResults = buildScanResultCache(TEST_SSID);
mRoamingScans = buildScanResultCache(ROAMING_SSID);
@@ -318,7 +318,7 @@ public class AccessPointTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 2, "WIFI", "WIFI_SUBTYPE");
AccessPoint accessPoint = new AccessPoint(mContext, configuration);
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(configuration.SSID));
wifiInfo.setSSID(WifiSsid.fromString(configuration.SSID));
wifiInfo.setBSSID(configuration.BSSID);
wifiInfo.setNetworkId(configuration.networkId);
accessPoint.update(configuration, wifiInfo, networkInfo);
@@ -334,7 +334,7 @@ public class AccessPointTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 2, "WIFI", "WIFI_SUBTYPE");
AccessPoint accessPoint = new AccessPoint(mContext, configuration);
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(configuration.SSID));
wifiInfo.setSSID(WifiSsid.fromString(configuration.SSID));
wifiInfo.setBSSID(configuration.BSSID);
wifiInfo.setNetworkId(configuration.networkId);
wifiInfo.setMeteredHint(true);
@@ -367,7 +367,7 @@ public class AccessPointTest {
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 2, "WIFI", "WIFI_SUBTYPE");
AccessPoint accessPoint = new AccessPoint(mContext, configuration);
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(configuration.SSID));
wifiInfo.setSSID(WifiSsid.fromString(configuration.SSID));
wifiInfo.setBSSID(configuration.BSSID);
wifiInfo.setNetworkId(configuration.networkId);
accessPoint.update(configuration, wifiInfo, networkInfo);
@@ -518,7 +518,7 @@ public class AccessPointTest {
final String connectedViaAppResourceString = "Connected via ";
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID));
wifiInfo.setSSID(WifiSsid.fromString(TEST_SSID));
wifiInfo.setEphemeral(true);
wifiInfo.setRequestingPackageName(appPackageName);
wifiInfo.setRssi(rssi);
@@ -585,7 +585,7 @@ public class AccessPointTest {
private WifiConfiguration createWifiConfiguration() {
WifiConfiguration configuration = new WifiConfiguration();
configuration.BSSID = "bssid";
configuration.SSID = "ssid";
configuration.SSID = "\"ssid\"";
configuration.networkId = 123;
return configuration;
}
@@ -1024,7 +1024,7 @@ public class AccessPointTest {
WifiInfo info = new WifiInfo();
info.setRssi(DEFAULT_RSSI);
info.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID));
info.setSSID(WifiSsid.fromString(TEST_SSID));
info.setBSSID(bssid);
info.setNetworkId(NETWORK_ID);

14
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
View File

@@ -124,7 +124,7 @@ public class WifiTrackerTest {
private static final int CONNECTED_RSSI = -50;
private static final WifiInfo CONNECTED_AP_1_INFO = new WifiInfo();
static {
CONNECTED_AP_1_INFO.setSSID(WifiSsid.createFromAsciiEncoded(SSID_1));
CONNECTED_AP_1_INFO.setSSID(WifiSsid.fromUtf8Text(SSID_1));
CONNECTED_AP_1_INFO.setBSSID(BSSID_1);
CONNECTED_AP_1_INFO.setNetworkId(NETWORK_ID_1);
CONNECTED_AP_1_INFO.setRssi(CONNECTED_RSSI);
@@ -246,7 +246,7 @@ public class WifiTrackerTest {
private static ScanResult buildScanResult1() {
return new ScanResult(
WifiSsid.createFromAsciiEncoded(SSID_1),
WifiSsid.fromUtf8Text(SSID_1),
BSSID_1,
0, // hessid
0, //anqpDomainId
@@ -259,7 +259,7 @@ public class WifiTrackerTest {
private static ScanResult buildScanResult2() {
return new ScanResult(
WifiSsid.createFromAsciiEncoded(SSID_2),
WifiSsid.fromUtf8Text(SSID_2),
BSSID_2,
0, // hessid
0, //anqpDomainId
@@ -272,7 +272,7 @@ public class WifiTrackerTest {
private static ScanResult buildScanResultWithTimestamp(long timestampMillis) {
return new ScanResult(
WifiSsid.createFromAsciiEncoded(SSID_3),
WifiSsid.fromUtf8Text(SSID_3),
BSSID_3,
0, // hessid
0, //anqpDomainId
@@ -444,7 +444,7 @@ public class WifiTrackerTest {
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTING, "connecting", "test");
WifiInfo info = new WifiInfo();
info.setSSID(WifiSsid.createFromAsciiEncoded(SSID_2));
info.setSSID(WifiSsid.fromUtf8Text(SSID_2));
info.setBSSID(BSSID_2);
info.setRssi(CONNECTED_RSSI);
info.setNetworkId(NETWORK_ID_2);
@@ -671,7 +671,7 @@ public class WifiTrackerTest {
String ssid = "ssid3";
String bssid = "00:00:00:00:00:00";
ScanResult newResult = new ScanResult(
WifiSsid.createFromAsciiEncoded(ssid),
WifiSsid.fromUtf8Text(ssid),
bssid,
0, // hessid
0, //anqpDomainId
@@ -720,7 +720,7 @@ public class WifiTrackerTest {
// Add a Passpoint AP to the scan results.
List<ScanResult> results = new ArrayList<>();
ScanResult passpointAp = new ScanResult(
WifiSsid.createFromAsciiEncoded(SSID_1),
WifiSsid.fromUtf8Text(SSID_1),
BSSID_1,
0, // hessid
0, //anqpDomainId

2
wifi/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java
View File

@@ -76,7 +76,7 @@ public class WifiNetworkScoreCacheTest {
private static ScanResult buildScanResult(String ssid, String bssid) {
return new ScanResult(
WifiSsid.createFromAsciiEncoded(ssid),
WifiSsid.fromUtf8Text(ssid),
bssid,
"" /* caps */,
0 /* level */,