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

Revert "[resolved conflict] Add test case to test normalize am: f444e9d182"

Browse Source 
This reverts commit fc719b474a.

Reason for revert: DroidMonitor-triggered revert due to breakage bug b/206448852

Bug: 206448852

Change-Id: I7f685bc1b2e4b2b3b33a2d2f0e430a321d7493fe
This commit is contained in:
Oriol Prieto Gasco
2021-11-15 20:16:06 +00:00
parent fc719b474a
commit 48683e2439
1 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/unit/java/android/net/NetworkTemplateTest.kt
View File

@@ -46,7 +46,6 @@ import android.net.NetworkTemplate.buildTemplateMobileWildcard
import android.net.NetworkTemplate.buildTemplateMobileWithRatType
import android.net.NetworkTemplate.buildTemplateWifi
import android.net.NetworkTemplate.buildTemplateWifiWildcard
import android.net.NetworkTemplate.normalize
import android.os.Build
import android.telephony.TelephonyManager
import com.android.testutils.DevSdkIgnoreRule
@@ -64,7 +63,6 @@ import kotlin.test.assertTrue
private const val TEST_IMSI1 = "imsi1"
private const val TEST_IMSI2 = "imsi2"
private const val TEST_IMSI3 = "imsi3"
private const val TEST_SSID1 = "ssid1"
private const val TEST_SSID2 = "ssid2"
@@ -495,45 +493,4 @@ class NetworkTemplateTest {
identSsid = TEST_SSID1)
matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI_WILDCARD, identSsid = TEST_SSID1)
}
@Test
fun testNormalize() {
var mergedImsiList = listOf(arrayOf(TEST_IMSI1, TEST_IMSI2))
val identMobileImsi1 = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI1), false /* defaultNetwork */,
TelephonyManager.NETWORK_TYPE_UMTS)
val identMobileImsi2 = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI2), false /* defaultNetwork */,
TelephonyManager.NETWORK_TYPE_UMTS)
val identMobileImsi3 = buildNetworkIdentity(mockContext,
buildMobileNetworkState(TEST_IMSI3), false /* defaultNetwork */,
TelephonyManager.NETWORK_TYPE_UMTS)
val identWifiImsi1Ssid1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI1, TEST_SSID1), true, 0)
val identWifiImsi2Ssid1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI2, TEST_SSID1), true, 0)
val identWifiImsi3Ssid1 = buildNetworkIdentity(
mockContext, buildWifiNetworkState(TEST_IMSI3, TEST_SSID1), true, 0)
normalize(buildTemplateMobileAll(TEST_IMSI1), mergedImsiList).also {
it.assertMatches(identMobileImsi1)
it.assertMatches(identMobileImsi2)
it.assertDoesNotMatch(identMobileImsi3)
}
normalize(buildTemplateCarrierMetered(TEST_IMSI1), mergedImsiList).also {
it.assertMatches(identMobileImsi1)
it.assertMatches(identMobileImsi2)
it.assertDoesNotMatch(identMobileImsi3)
}
normalize(buildTemplateWifi(TEST_SSID1, TEST_IMSI1), mergedImsiList).also {
it.assertMatches(identWifiImsi1Ssid1)
it.assertMatches(identWifiImsi2Ssid1)
it.assertDoesNotMatch(identWifiImsi3Ssid1)
}
normalize(buildTemplateMobileWildcard(), mergedImsiList).also {
it.assertMatches(identMobileImsi1)
it.assertMatches(identMobileImsi2)
it.assertMatches(identMobileImsi3)
}
}
}