Merge "Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub" into main

This commit is contained in:
Chaohui Wang
2023-08-31 07:07:48 +00:00
committed by Android (Google) Code Review

View File

@@ -26,7 +26,6 @@ import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -34,7 +33,7 @@ import org.mockito.Mock
import org.mockito.Spy
import org.mockito.junit.MockitoJUnit
import org.mockito.junit.MockitoRule
import org.mockito.Mockito.`when` as whenever
import org.mockito.kotlin.whenever
@RunWith(AndroidJUnit4::class)
class DataUsageLibTest {
@@ -86,20 +85,6 @@ class DataUsageLibTest {
assertThat(mobileTemplate.meteredness).isEqualTo(NetworkStats.METERED_YES)
}
@Test
@Ignore("b/297923588")
fun getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub() {
whenever(subscriptionManager.availableSubscriptionInfoList)
.thenReturn(listOf(SUBSCRIBER_INFO))
whenever(telephonyManager.mergedImsisFromGroup).thenReturn(null)
val mobileTemplate = DataUsageLib.getMobileTemplate(context, SUB_ID)
assertThat(mobileTemplate.matchRule).isEqualTo(NetworkTemplate.MATCH_CARRIER)
assertThat(mobileTemplate.subscriberIds).containsExactly(SUBSCRIBER_ID)
assertThat(mobileTemplate.meteredness).isEqualTo(NetworkStats.METERED_YES)
}
@Test
fun getMobileTemplate_mergedImsisFromGroupEmpty_returnRequestedSub() {
whenever(subscriptionManager.availableSubscriptionInfoList)