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

Commit 70cbafc6 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed flaky data unit tests" 

am: b9fd76e2

Change-Id: I60ae7e7a3086f537cbfd2159945be7e47ff137bb
parents 5688d2e9 b9fd76e2

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.eq; 


import android.app.ActivityManager;

import android.app.IActivityManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.IIntentSender;

import android.content.Intent;
@@ -41,6 +42,7 @@ import android.os.IDeviceIdleController; 
import android.os.RegistrantList;

import android.os.ServiceManager;

import android.provider.BlockedNumberContract;

import android.provider.Settings;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -460,6 +462,14 @@ public abstract class TelephonyTest { 
        //SIM

        doReturn(1).when(mTelephonyManager).getSimCount();



        //Data

        //Initial state is: userData enabled, provisioned.

        ContentResolver resolver = mContext.getContentResolver();

        Settings.Global.putInt(resolver, Settings.Global.MOBILE_DATA, 1);

        Settings.Global.putInt(resolver, Settings.Global.DEVICE_PROVISIONED, 1);

        Settings.Global.putInt(resolver,

                Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED, 1);



        //Use reflection to mock singletons

        replaceInstance(CallManager.class, "INSTANCE", null, mCallManager);

        replaceInstance(TelephonyComponentFactory.class, "sInstance", null,

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+0 −5
Original line number Diff line number Diff line
@@ -1247,12 +1247,7 @@ public class DcTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testDataEnableInProvisioning() throws Exception {

        // Initial state is: userData enabled, provisioned.

        ContentResolver resolver = mContext.getContentResolver();

        Settings.Global.putInt(resolver, Settings.Global.MOBILE_DATA, 1);

        Settings.Global.putInt(resolver, Settings.Global.DEVICE_PROVISIONED, 1);

        Settings.Global.putInt(resolver,

                Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED, 1);



        assertEquals(1, Settings.Global.getInt(resolver, Settings.Global.MOBILE_DATA));

        assertTrue(mDct.isDataEnabled());