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

Merge "Skip CaptivePortalTest for wearables"

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-09 17:59:04 +00:00
committed by Gerrit Code Review
parent 99e50a0fc9 679264f388
commit 3a1a22b82a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/src/android/net/cts/CaptivePortalTest.kt
View File

@@ -20,6 +20,7 @@ import android.Manifest.permission.CONNECTIVITY_INTERNAL
import android.Manifest.permission.NETWORK_SETTINGS import android.Manifest.permission.NETWORK_SETTINGS
import android.Manifest.permission.READ_DEVICE_CONFIG import android.Manifest.permission.READ_DEVICE_CONFIG
import android.content.pm.PackageManager.FEATURE_TELEPHONY import android.content.pm.PackageManager.FEATURE_TELEPHONY
import android.content.pm.PackageManager.FEATURE_WATCH
import android.content.pm.PackageManager.FEATURE_WIFI import android.content.pm.PackageManager.FEATURE_WIFI
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback import android.net.ConnectivityManager.NetworkCallback
@@ -57,6 +58,7 @@ import fi.iki.elonen.NanoHTTPD.Response.Status
import junit.framework.AssertionFailedError import junit.framework.AssertionFailedError
import org.junit.After import org.junit.After
import org.junit.Assume.assumeTrue import org.junit.Assume.assumeTrue
import org.junit.Assume.assumeFalse
import org.junit.Before import org.junit.Before
import org.junit.runner.RunWith import org.junit.runner.RunWith
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
@@ -128,6 +130,7 @@ class CaptivePortalTest {
fun testCaptivePortalIsNotDefaultNetwork() { fun testCaptivePortalIsNotDefaultNetwork() {
assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY)) assumeTrue(pm.hasSystemFeature(FEATURE_TELEPHONY))
assumeTrue(pm.hasSystemFeature(FEATURE_WIFI)) assumeTrue(pm.hasSystemFeature(FEATURE_WIFI))
assumeFalse(pm.hasSystemFeature(FEATURE_WATCH))
utils.ensureWifiConnected() utils.ensureWifiConnected()
val cellNetwork = utils.connectToCell() val cellNetwork = utils.connectToCell()