From 88343a3d7c79e8e5185666ddb935a6bd9f024313 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 29 Aug 2023 13:02:53 +0800 Subject: [PATCH] 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 --- .../settings/datausage/lib/DataUsageLibTest.kt | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt index 18af600ba65..e3ec90a7cf8 100644 --- a/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt +++ b/tests/spa_unit/src/com/android/settings/datausage/lib/DataUsageLibTest.kt @@ -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)