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

Commit ee5c35e0 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed flaky unit tests 

Test: Telephony unit tests
bug: 29579544
Merged-In: If732d23d9f9bc0bb7b4dc6246d2af116c755cdc9
Change-Id: If732d23d9f9bc0bb7b4dc6246d2af116c755cdc9
(cherry picked from commit e11ff878)
parent 76951491

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

+8 −7
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ 
 */

package com.android.internal.telephony;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import android.database.ContentObserver;

import android.net.Uri;

import android.os.Bundle;
@@ -32,13 +39,6 @@ import org.junit.Test; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



public class CarrierActionAgentTest extends TelephonyTest {

    private CarrierActionAgent mCarrierActionAgentUT;

    private FakeContentResolver mFakeContentResolver;
@@ -126,6 +126,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 


        verify(mRadioActionHandler).sendMessageAtTime(message.capture(), anyLong());

        assertEquals(RADIO_CARRIER_ACTION_EVENT, message.getValue().what);

        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);

    }



    @After

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

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,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;
@@ -441,6 +442,9 @@ public abstract class TelephonyTest { 
        mSST.mSS = mServiceState;

        mServiceManagerMockedServices.put("connectivity_metrics_logger", mConnMetLoggerBinder);



        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);



        setReady(false);

    }

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+24 −24
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ 
 */

package com.android.internal.telephony.imsphone;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;
@@ -26,7 +45,6 @@ import android.support.test.filters.FlakyTest; 
import android.telephony.PhoneNumberUtils;

import android.telephony.ims.feature.ImsFeature;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.LargeTest;



import com.android.ims.ImsCall;

import com.android.ims.ImsCallProfile;
@@ -38,7 +56,6 @@ import com.android.ims.ImsReasonInfo; 
import com.android.ims.ImsServiceClass;

import com.android.ims.internal.ImsCallSession;

import com.android.internal.telephony.Call;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.Connection;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyTest;
@@ -46,33 +63,12 @@ import com.android.internal.telephony.TelephonyTest; 
import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.mockito.Mock;

import org.mockito.invocation.InvocationOnMock;

import org.mockito.stubbing.Answer;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



public class ImsPhoneCallTrackerTest extends TelephonyTest {

    private ImsPhoneCallTracker mCTUT;

    private ImsCTHandlerThread mImsCTHandlerThread;
@@ -370,6 +366,8 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        assertEquals(Call.State.ALERTING, mCTUT.mForegroundCall.getState());

    }



    @FlakyTest

    @Ignore

    @Test

    @SmallTest

    public void testImsMTActiveMODial() {
@@ -476,6 +474,8 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
                nullable(ImsConnectionStateListener.class));

    }



    @FlakyTest

    @Ignore

    @Test

    @SmallTest

    public void testTTYImsServiceUnavailable() throws ImsException {