Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" am: bec47acfaa

Change-Id: Ia3ce4c1e115f74c9771e9b49af633a2d278edaf5
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:06:13 +00:00

View File

@@ -687,6 +687,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
if(!hasWifi()) {
return;
}
mWifiManager = (WifiManager) mContext mWifiManager = (WifiManager) mContext
.getSystemService(Context.WIFI_SERVICE); .getSystemService(Context.WIFI_SERVICE);
assertNotNull(mWifiManager); assertNotNull(mWifiManager);
@@ -778,6 +781,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
} }
public void testEnterpriseConfigDoesNotPrintPassword() { public void testEnterpriseConfigDoesNotPrintPassword() {
if(!hasWifi()) {
return;
}
WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig(); WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
final String identity = "IdentityIsOkayToBeDisplayedHere"; final String identity = "IdentityIsOkayToBeDisplayedHere";
final String password = "PasswordIsNotOkayToBeDisplayedHere"; final String password = "PasswordIsNotOkayToBeDisplayedHere";