LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24

Browse Source 
am: 155a81349f

Change-Id: I0b4f12d41263db0fd69cce933af915f46fa3ff31
This commit is contained in:
Glen Kuhne
2017-01-18 18:24:45 +00:00
committed by android-build-merger
parent 6a89797685 1b93dea624
commit 968719035d
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.wifi.ScanResult; import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
@@ -35,6 +34,8 @@ import android.provider.Settings;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.util.Log; import android.util.Log;
import com.android.compatibility.common.util.WifiConfigCreator;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.HashSet; import java.util.HashSet;
@@ -68,6 +69,8 @@ public class WifiManagerTest extends AndroidTestCase {
private static final String TAG = "WifiManagerTest"; private static final String TAG = "WifiManagerTest";
private static final String SSID1 = "\"WifiManagerTest\""; private static final String SSID1 = "\"WifiManagerTest\"";
private static final String SSID2 = "\"WifiManagerTestModified\""; private static final String SSID2 = "\"WifiManagerTestModified\"";
private static final String PROXY_TEST_SSID = "SomeProxyAp";
private static final String ADD_NETWORK_EXCEPTION_SUBSTR = "addNetwork";
private static final int TIMEOUT_MSEC = 6000; private static final int TIMEOUT_MSEC = 6000;
private static final int WAIT_MSEC = 60; private static final int WAIT_MSEC = 60;
private static final int DURATION = 10000; private static final int DURATION = 10000;
@@ -75,6 +78,8 @@ public class WifiManagerTest extends AndroidTestCase {
private static final int WIFI_SCAN_TEST_CACHE_DELAY_MILLIS = 3 * 60 * 1000; private static final int WIFI_SCAN_TEST_CACHE_DELAY_MILLIS = 3 * 60 * 1000;
private static final int WIFI_SCAN_TEST_ITERATIONS = 5; private static final int WIFI_SCAN_TEST_ITERATIONS = 5;
private static final String TEST_PAC_URL = "http://www.example.com/proxy.pac";
private IntentFilter mIntentFilter; private IntentFilter mIntentFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -405,6 +410,31 @@ public class WifiManagerTest extends AndroidTestCase {
} }
} }
/**
* Verifies that addNetwork() fails for WifiConfigurations containing a non-null http proxy when
* the caller doesn't have OVERRIDE_WIFI_CONFIG permission, DeviceOwner or ProfileOwner device
* management policies
*/
public void testSetHttpProxy_PermissionFail() throws Exception {
if (!WifiFeature.isWifiSupported(getContext())) {
// skip the test if WiFi is not supported
return;
}
WifiConfigCreator configCreator = new WifiConfigCreator(getContext());
boolean exceptionThrown = false;
try {
configCreator.addHttpProxyNetworkVerifyAndRemove(
PROXY_TEST_SSID, TEST_PAC_URL);
} catch (IllegalStateException e) {
// addHttpProxyNetworkVerifyAndRemove throws three IllegalStateException,
// expect it to throw for the addNetwork operation
if (e.getMessage().contains(ADD_NETWORK_EXCEPTION_SUBSTR)) {
exceptionThrown = true;
}
}
assertTrue(exceptionThrown);
}
private Set<String> getEnabledNetworks(List<WifiConfiguration> configuredNetworks) { private Set<String> getEnabledNetworks(List<WifiConfiguration> configuredNetworks) {
Set<String> ssids = new HashSet<String>(); Set<String> ssids = new HashSet<String>();
for (WifiConfiguration wifiConfig : configuredNetworks) { for (WifiConfiguration wifiConfig : configuredNetworks) {