diff options
| author | 2020-04-09 11:04:15 +0800 | |
|---|---|---|
| committer | 2020-04-13 08:13:04 +0000 | |
| commit | f4ebfd4bde0c20ac49f1926b92c79bf913c944b6 (patch) | |
| tree | aff3feb5ae23690e102651f52ab84b7cb0610ec7 | |
| parent | 964975c842ba1b76b8e0587883e23dedbb1697eb (diff) | |
Move CaptivePortalDataTest to common test to support cts
Commit has to on top of aosp/1281921 to skip whole test in Q
device since CaptivePortalData class is introduced in R.
Result in Q will be:
[1/1] android.net.CaptivePortalDataTest#skippedClassForDevSdkMismatch: IGNORED
Bug: 152280218
Bug: 150640683
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest on
both Q and R device
Change-Id: Iddd00e1c85abe767b1a41a1761d3266ba322dba6
| -rw-r--r-- | tests/net/common/java/android/net/CaptivePortalDataTest.kt (renamed from tests/net/java/android/net/CaptivePortalDataTest.kt) | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/net/java/android/net/CaptivePortalDataTest.kt b/tests/net/common/java/android/net/CaptivePortalDataTest.kt index 00714382684f..51068c2c575f 100644 --- a/tests/net/java/android/net/CaptivePortalDataTest.kt +++ b/tests/net/common/java/android/net/CaptivePortalDataTest.kt @@ -16,17 +16,20 @@ package android.net +import android.os.Build import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.testutils.assertParcelSane import com.android.testutils.assertParcelingIsLossless +import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith import kotlin.test.assertEquals import kotlin.test.assertNotEquals @SmallTest -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) +@IgnoreUpTo(Build.VERSION_CODES.Q) class CaptivePortalDataTest { private val data = CaptivePortalData.Builder() .setRefreshTime(123L) |