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

Merge "Fix CaptivePortalDataTest on R-" am: 116341a9ef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie16759138fd84a46bf7d3d30c3a254b2ee72264a
This commit is contained in:
Treehugger Robot
2021-01-15 06:20:18 +00:00
committed by Automerger Merge Worker
parent fadb5494f1 116341a9ef
commit 9e954646a4
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/net/common/java/android/net/CaptivePortalDataTest.kt
View File

@@ -18,12 +18,15 @@ package android.net
import android.os.Build import android.os.Build
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.modules.utils.build.SdkLevel
import com.android.testutils.assertParcelSane import com.android.testutils.assertParcelSane
import com.android.testutils.assertParcelingIsLossless import com.android.testutils.assertParcelingIsLossless
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.DevSdkIgnoreRunner
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import kotlin.test.assertEquals import kotlin.test.assertEquals
@@ -33,6 +36,9 @@ import kotlin.test.assertNotEquals
@RunWith(DevSdkIgnoreRunner::class) @RunWith(DevSdkIgnoreRunner::class)
@IgnoreUpTo(Build.VERSION_CODES.Q) @IgnoreUpTo(Build.VERSION_CODES.Q)
class CaptivePortalDataTest { class CaptivePortalDataTest {
@Rule @JvmField
val ignoreRule = DevSdkIgnoreRule()
private val data = CaptivePortalData.Builder() private val data = CaptivePortalData.Builder()
.setRefreshTime(123L) .setRefreshTime(123L)
.setUserPortalUrl(Uri.parse("https://portal.example.com/test")) .setUserPortalUrl(Uri.parse("https://portal.example.com/test"))
@@ -41,7 +47,11 @@ class CaptivePortalDataTest {
.setBytesRemaining(456L) .setBytesRemaining(456L)
.setExpiryTime(789L) .setExpiryTime(789L)
.setCaptive(true) .setCaptive(true)
.setVenueFriendlyName("venue friendly name") .apply {
if (SdkLevel.isAtLeastS()) {
setVenueFriendlyName("venue friendly name")
}
}
.build() .build()
private fun makeBuilder() = CaptivePortalData.Builder(data) private fun makeBuilder() = CaptivePortalData.Builder(data)
@@ -67,8 +77,11 @@ class CaptivePortalDataTest {
assertNotEqualsAfterChange { it.setBytesRemaining(789L) } assertNotEqualsAfterChange { it.setBytesRemaining(789L) }
assertNotEqualsAfterChange { it.setExpiryTime(12L) } assertNotEqualsAfterChange { it.setExpiryTime(12L) }
assertNotEqualsAfterChange { it.setCaptive(false) } assertNotEqualsAfterChange { it.setCaptive(false) }
assertNotEqualsAfterChange { it.setVenueFriendlyName("another friendly name") }
assertNotEqualsAfterChange { it.setVenueFriendlyName(null) } if (SdkLevel.isAtLeastS()) {
assertNotEqualsAfterChange { it.setVenueFriendlyName("another friendly name") }
assertNotEqualsAfterChange { it.setVenueFriendlyName(null) }
}
} }
@Test @Test
@@ -111,7 +124,7 @@ class CaptivePortalDataTest {
assertFalse(makeBuilder().setCaptive(false).build().isCaptive) assertFalse(makeBuilder().setCaptive(false).build().isCaptive)
} }
@Test @Test @IgnoreUpTo(Build.VERSION_CODES.R)
fun testVenueFriendlyName() { fun testVenueFriendlyName() {
assertEquals("venue friendly name", data.venueFriendlyName) assertEquals("venue friendly name", data.venueFriendlyName)
} }