Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b8546 am: f0d6757404

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976232

Change-Id: I4eb14d6d898406af4390db2389ef60f56dc39444
This commit is contained in:
Junyu Lai
2022-02-09 10:12:25 +00:00
committed by Automerger Merge Worker

View File

@@ -81,8 +81,8 @@ public class DataUsageUtilsTest {
when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false); when(mSubscriptionManager.isActiveSubscriptionId(SUB_ID)).thenReturn(false);
final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
} }
@Test @Test
@@ -94,8 +94,8 @@ public class DataUsageUtilsTest {
.thenReturn(new String[] {SUBSCRIBER_ID}); .thenReturn(new String[] {SUBSCRIBER_ID});
final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isFalse();
} }
@Test @Test
@@ -107,7 +107,7 @@ public class DataUsageUtilsTest {
.thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2}); .thenReturn(new String[] {SUBSCRIBER_ID, SUBSCRIBER_ID_2});
final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID); final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID)).isTrue();
assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isTrue(); assertThat(networkTemplate.getSubscriberIds().contains(SUBSCRIBER_ID_2)).isTrue();
} }
} }