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

Merge "Add debug logs to CaptivePortalTests"

Browse Source
This commit is contained in:
Chalard Jean
2021-09-07 04:36:55 +00:00
committed by Gerrit Code Review
parent 26a7e61417 d0d5c64bab
commit fe1a4f6e60
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import android.platform.test.annotations.AppModeFull
import android.provider.DeviceConfig import android.provider.DeviceConfig
import android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY import android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY
import android.text.TextUtils import android.text.TextUtils
import android.util.Log
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import com.android.testutils.RecorderCallback import com.android.testutils.RecorderCallback
@@ -79,6 +80,8 @@ private const val LOCALHOST_HOSTNAME = "localhost"
private const val WIFI_CONNECT_TIMEOUT_MS = 120_000L private const val WIFI_CONNECT_TIMEOUT_MS = 120_000L
private const val TEST_TIMEOUT_MS = 10_000L private const val TEST_TIMEOUT_MS = 10_000L
private const val TAG = "CaptivePortalTest"
private fun <T> CompletableFuture<T>.assertGet(timeoutMs: Long, message: String): T { private fun <T> CompletableFuture<T>.assertGet(timeoutMs: Long, message: String): T {
try { try {
return get(timeoutMs, TimeUnit.MILLISECONDS) return get(timeoutMs, TimeUnit.MILLISECONDS)
@@ -155,6 +158,7 @@ class CaptivePortalTest {
server.addResponse(Request(TEST_HTTP_URL_PATH), Status.REDIRECT, headers) server.addResponse(Request(TEST_HTTP_URL_PATH), Status.REDIRECT, headers)
setHttpsUrlDeviceConfig(makeUrl(TEST_HTTPS_URL_PATH)) setHttpsUrlDeviceConfig(makeUrl(TEST_HTTPS_URL_PATH))
setHttpUrlDeviceConfig(makeUrl(TEST_HTTP_URL_PATH)) setHttpUrlDeviceConfig(makeUrl(TEST_HTTP_URL_PATH))
Log.d(TAG, "Set portal URLs to $TEST_HTTPS_URL_PATH and $TEST_HTTP_URL_PATH")
// URL expiration needs to be in the next 10 minutes // URL expiration needs to be in the next 10 minutes
assertTrue(WIFI_CONNECT_TIMEOUT_MS < TimeUnit.MINUTES.toMillis(10)) assertTrue(WIFI_CONNECT_TIMEOUT_MS < TimeUnit.MINUTES.toMillis(10))
setUrlExpirationDeviceConfig(System.currentTimeMillis() + WIFI_CONNECT_TIMEOUT_MS) setUrlExpirationDeviceConfig(System.currentTimeMillis() + WIFI_CONNECT_TIMEOUT_MS)