Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88343a3d authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove getMobileTemplate_mergedImsisFromGroupNull_returnRequestedSub 

Because,
 - telephonyManager.mergedImsisFromGroup is @NonNull
 - telephonyManager.mergedImsisFromGroup is fixed, will not return null
 - This test no longer feasible, since return null will crash now

Bug: 297923588
Test: atest SettingsSpaUnitTests
Change-Id: Ic09cd9b5a36a4743a65e05105ce2e814c020491f
parent 7bdddc9c

tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt

+1 −16
Original line number Diff line number Diff line
@@ -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)