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

Commit a73cb31f authored by Bonian Chen's avatar Bonian Chen
Browse files

[Settings] Fix DataUsageSummaryTest

Fix DataUsageSummaryTest

Bug: 154563784
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: I32f8fc00f01a335950e863d5c9801ee9af0a3f5d
parent 9a8f64e6
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -78,10 +78,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
        super.onCreate(icicle);
        Context context = getContext();

        // Enable ProxySubscriptionMgr with Lifecycle support for all controllers
        // live within this fragment
        mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
        mProxySubscriptionMgr.setLifecycle(getLifecycle());
        enableProxySubscriptionManager(context);

        boolean hasMobileData = DataUsageUtils.hasMobileData(context);

@@ -151,6 +148,14 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
        addMobileSection(subId, null);
    }

    @VisibleForTesting
    void enableProxySubscriptionManager(Context context) {
        // Enable ProxySubscriptionMgr with Lifecycle support for all controllers
        // live within this fragment
        mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
        mProxySubscriptionMgr.setLifecycle(getLifecycle());
    }

    private void addMobileSection(int subId, SubscriptionInfo subInfo) {
        TemplatePreferenceCategory category = (TemplatePreferenceCategory)
                inflatePreferences(R.xml.data_usage_cellular);
+6 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.datausage;

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doNothing;
@@ -83,7 +84,7 @@ public class DataUsageSummaryTest {
        ShadowUserManager.getShadow().setIsAdminUser(true);
        shadowContext.setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager);

        mContext = spy(RuntimeEnvironment.application);
        mContext = RuntimeEnvironment.application;
        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
        final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(mTelephonyManager);
        shadowTelephonyManager.setTelephonyManagerForSubscriptionId(
@@ -112,6 +113,7 @@ public class DataUsageSummaryTest {
        ShadowDataUsageUtils.HAS_SIM = true;

        final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
        doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
        doReturn(mContext).when(dataUsageSummary).getContext();

        doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -125,13 +127,13 @@ public class DataUsageSummaryTest {
    }

    @Test
    @Ignore
    public void configuration_withoutSim_shouldShowWifiSectionOnly() {
        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
        ShadowDataUsageUtils.HAS_SIM = false;

        final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
        doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
        doReturn(mContext).when(dataUsageSummary).getContext();

        doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -145,13 +147,13 @@ public class DataUsageSummaryTest {
    }

    @Test
    @Ignore
    public void configuration_withoutMobile_shouldShowWifiSectionOnly() {
        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = false;
        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
        ShadowDataUsageUtils.HAS_SIM = false;

        final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
        doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
        doReturn(mContext).when(dataUsageSummary).getContext();

        doReturn(true).when(dataUsageSummary).removePreference(anyString());
@@ -166,7 +168,6 @@ public class DataUsageSummaryTest {

    @Test
    @Config(shadows = ShadowSubscriptionManager.class)
    @Ignore
    public void configuration_invalidDataSusbscription_shouldShowWifiSectionOnly() {
        ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
@@ -175,6 +176,7 @@ public class DataUsageSummaryTest {
                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
        doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
        doReturn(mContext).when(dataUsageSummary).getContext();

        doReturn(true).when(dataUsageSummary).removePreference(anyString());