Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ebfd4b authored by Chiachang Wang's avatar Chiachang Wang Committed by Chalard Jean
Browse files

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
parent 964975c8

tests/net/java/android/net/CaptivePortalDataTest.kt→tests/net/common/java/android/net/CaptivePortalDataTest.kt

+5 −2
Original line number Diff line number Diff line
@@ -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)