commit d7b44100223f4ebff8994a584091d3796a0c054f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 17 00:08:00 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 17 00:08:00 2021 +0000
tree 876f1e2a69465c345e36e8440cdc0ec4623c36d2
parent f37107b2fefa250f51abccf181bf189269065f31
parent 48683e24395a548524580ee194fdfa662732a168

Snap for 7921329 from 48683e24395a548524580ee194fdfa662732a168 to sc-v2-release

Change-Id: I12aa37e6cca5f5a3fd9f4946318b729ccd04054a

tests/unit/java/android/net/NetworkTemplateTest.kt

diff --git a/tests/unit/java/android/net/NetworkTemplateTest.kt b/tests/unit/java/android/net/NetworkTemplateTest.kt
index 572c1ef..2db77f2 100644
--- a/tests/unit/java/android/net/NetworkTemplateTest.kt
+++ b/tests/unit/java/android/net/NetworkTemplateTest.kt
@@ -46,7 +46,6 @@
 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 @@
 
 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 @@
                 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)
-        }
-    }
 }