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

Merge "Add a test for getCaptivePortalServerUrl" am: ddb629663b am: 68cf03184a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1431431

Change-Id: I1cbbbce5b7283dd0b4089f0ba24b1dabe9e9f544
This commit is contained in:
Remi NGUYEN VAN
2020-10-07 07:47:40 +00:00
committed by Automerger Merge Worker
parent c54186c01b 68cf03184a
commit 853764c208
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -17,6 +17,7 @@
package android.net.cts; package android.net.cts;
import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS; import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS;
import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.content.pm.PackageManager.FEATURE_ETHERNET; import static android.content.pm.PackageManager.FEATURE_ETHERNET;
import static android.content.pm.PackageManager.FEATURE_TELEPHONY; import static android.content.pm.PackageManager.FEATURE_TELEPHONY;
import static android.content.pm.PackageManager.FEATURE_USB_HOST; import static android.content.pm.PackageManager.FEATURE_USB_HOST;
@@ -41,6 +42,7 @@ import static android.system.OsConstants.AF_UNSPEC;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand; import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
import static com.android.testutils.TestPermissionUtil.runAsShell;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@@ -103,6 +105,8 @@ import com.android.testutils.TestableNetworkCallback;
import libcore.io.Streams; import libcore.io.Streams;
import junit.framework.AssertionFailedError;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -118,6 +122,7 @@ import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.Socket; import java.net.Socket;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -1499,4 +1504,17 @@ public class ConnectivityManagerTest {
return runShellCommand("cmd connectivity airplane-mode") return runShellCommand("cmd connectivity airplane-mode")
.trim().equals("enabled"); .trim().equals("enabled");
} }
@Test
public void testGetCaptivePortalServerUrl() {
final String url = runAsShell(NETWORK_SETTINGS, mCm::getCaptivePortalServerUrl);
assertNotNull("getCaptivePortalServerUrl must not be null", url);
try {
final URL parsedUrl = new URL(url);
// As per the javadoc, the URL must be HTTP
assertEquals("Invalid captive portal URL protocol", "http", parsedUrl.getProtocol());
} catch (MalformedURLException e) {
throw new AssertionFailedError("Captive portal server URL is invalid: " + e);
}
}
} }