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

Commit e47a6f23 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"

parents 579e3ca0 516010d1

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

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.net.ConnectivityManager; 
import android.os.BatteryManager;

import android.os.HandlerThread;

import android.os.Message;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;



import org.junit.After;
@@ -74,6 +75,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
        super.tearDown();

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testTethering() throws Exception {
@@ -100,6 +102,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
                eq(true), any(Message.class));

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testCharging() throws Exception {

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Message; 
import android.os.Process;

import android.os.WorkSource;

import android.preference.PreferenceManager;

import android.support.test.filters.FlakyTest;

import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.ServiceState;
@@ -401,6 +402,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testVoiceMailCount() {
@@ -506,6 +508,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
     * GsmCdmaPhone handles a lot of messages. This function verifies behavior for messages that are

     * received when obj is created and that are received on phone type switch

     */

    @FlakyTest

    @Test

    @SmallTest

    public void testHandleInitialMessages() {

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

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
                mSimulatedCommands.getGetNetworkSelectionModeCallCount());

    }



    @FlakyTest

    @Test

    @MediumTest

    public void testSpnUpdateShowPlmnOnly() {

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.HandlerThread; 
import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Telephony;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.internal.telephony.SmsStorageMonitor;
@@ -97,6 +98,7 @@ public class GsmCellBroadcastHandlerTest extends TelephonyTest { 
        super.tearDown();

    }



    @FlakyTest

    @Test @SmallTest

    public void testBroadcastSms() {

        mContextFixture.putResource(

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

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.telephony.imsphone;



import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.ims.ImsStreamMediaProfile;
@@ -59,6 +60,7 @@ public class ImsPhoneCallTest extends TelephonyTest { 
        super.tearDown();

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testAttachDetach() {
@@ -81,6 +83,7 @@ public class ImsPhoneCallTest extends TelephonyTest { 
        assertEquals(Call.State.IDLE, mImsCallUT.getState());

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testConnectionDisconnected() {
@@ -98,6 +101,7 @@ public class ImsPhoneCallTest extends TelephonyTest { 
        assertEquals(Call.State.DISCONNECTED, mImsCallUT.getState());

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testHangup() {
@@ -109,6 +113,7 @@ public class ImsPhoneCallTest extends TelephonyTest { 
        }

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testUpdateRingBackTone() {
@@ -140,6 +145,7 @@ public class ImsPhoneCallTest extends TelephonyTest { 
        assertEquals(mConnection2, mImsCallUT.getConnections().get(0));

    }



    @FlakyTest

    @Test

    @SmallTest

    public void testMultiParty() {