PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: 1e465439ad am: 944506d7fa

Browse Source 
Change-Id: I29e6089254883ea5543708ceb1481c2e40f6ae18
This commit is contained in:
Bonian Chen
2020-04-25 05:50:14 +00:00
committed by Automerger Merge Worker
parent 71922d920c 944506d7fa
commit af6cab97b3
4 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -114,6 +114,7 @@ public class DataUsageSummaryTest {
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
doReturn(true).when(dataUsageSummary).hasActiveSubscription();
doReturn(mContext).when(dataUsageSummary).getContext();
doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -134,6 +135,7 @@ public class DataUsageSummaryTest {
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
doReturn(false).when(dataUsageSummary).hasActiveSubscription();
doReturn(mContext).when(dataUsageSummary).getContext();
doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -154,6 +156,7 @@ public class DataUsageSummaryTest {
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
doReturn(false).when(dataUsageSummary).hasActiveSubscription();
doReturn(mContext).when(dataUsageSummary).getContext();
doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -177,6 +180,7 @@ public class DataUsageSummaryTest {
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
doReturn(false).when(dataUsageSummary).hasActiveSubscription();
doReturn(mContext).when(dataUsageSummary).getContext();
doReturn(true).when(dataUsageSummary).removePreference(anyString());

17
tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
View File

@@ -31,7 +31,6 @@ import android.telephony.TelephonyManager;
import android.util.DataUnit;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -76,22 +75,6 @@ public final class DataUsageUtilsTest {
assertThat(hasMobileData).isFalse();
}
@Test
@Ignore
public void hasSim_simStateReady() {
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_READY);
final boolean hasSim = DataUsageUtils.hasSim(mContext);
assertThat(hasSim).isTrue();
}
@Test
@Ignore
public void hasSim_simStateMissing() {
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
final boolean hasSim = DataUsageUtils.hasSim(mContext);
assertThat(hasSim).isFalse();
}
@Test
public void formatDataUsage_useIECUnit() {
final CharSequence formattedDataUsage = DataUsageUtils.formatDataUsage(