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

Merge "Add test for NetworkTemplate.Builder#setRoaming(int)" am: c7975ff3bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2020578

Change-Id: I89eca100f8547a595a38f787ee086b673cbf6821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Huang
2022-05-03 07:33:42 +00:00
committed by Automerger Merge Worker
parent d5c7837172 c7975ff3bf
commit 22bfde676f
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/common/java/android/net/netstats/NetworkTemplateTest.kt
View File

@@ -19,6 +19,7 @@ package android.net.netstats
import android.net.NetworkStats.DEFAULT_NETWORK_ALL import android.net.NetworkStats.DEFAULT_NETWORK_ALL
import android.net.NetworkStats.METERED_ALL import android.net.NetworkStats.METERED_ALL
import android.net.NetworkStats.METERED_YES import android.net.NetworkStats.METERED_YES
import android.net.NetworkStats.ROAMING_YES
import android.net.NetworkStats.ROAMING_ALL import android.net.NetworkStats.ROAMING_ALL
import android.net.NetworkTemplate import android.net.NetworkTemplate
import android.net.NetworkTemplate.MATCH_BLUETOOTH import android.net.NetworkTemplate.MATCH_BLUETOOTH
@@ -84,6 +85,19 @@ class NetworkTemplateTest {
} }
} }
// Verify template which matches roaming cellular and carrier networks with
// the given IMSI.
listOf(MATCH_MOBILE, MATCH_CARRIER).forEach { matchRule ->
NetworkTemplate.Builder(matchRule).setSubscriberIds(setOf(TEST_IMSI1))
.setRoaming(ROAMING_YES).setMeteredness(METERED_YES).build().let {
val expectedTemplate = NetworkTemplate(matchRule, TEST_IMSI1,
arrayOf(TEST_IMSI1), arrayOf<String>(), METERED_YES,
ROAMING_YES, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
assertEquals(expectedTemplate, it)
}
}
// Verify carrier template cannot be created without IMSI. // Verify carrier template cannot be created without IMSI.
assertFailsWith<IllegalArgumentException> { assertFailsWith<IllegalArgumentException> {
NetworkTemplate.Builder(MATCH_CARRIER).build() NetworkTemplate.Builder(MATCH_CARRIER).build()