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

Commit 819afa14 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Add @FlakyTest annotation to @Postsubmit tests"

parents c4de1cb3 a23494ed

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.internal.telephony; 


import android.os.HandlerThread;

import android.platform.test.annotations.Postsubmit;

import android.support.test.filters.FlakyTest;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import android.telephony.ServiceState;
@@ -176,6 +177,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 


    }



    @FlakyTest

    @Postsubmit

    @Test

    @MediumTest

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 


import android.net.Uri;

import android.platform.test.annotations.Postsubmit;

import android.support.test.filters.FlakyTest;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.SpannableStringBuilder;
@@ -413,6 +414,7 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { 
    }



    // To run this test, the device has to be registered with network

    @FlakyTest

    @Postsubmit

    public void testCheckAndProcessPlusCode() {

        assertEquals("0118475797000",

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

+3 −1
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ import android.os.Message; 
import android.os.Parcel;

import android.os.Process;

import android.os.UserHandle;

import android.platform.test.annotations.Postsubmit;

import android.os.WorkSource;

import android.platform.test.annotations.Postsubmit;

import android.support.test.filters.FlakyTest;

import android.telephony.CellInfo;

import android.telephony.CellInfoGsm;

import android.telephony.ServiceState;
@@ -316,6 +317,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertFalse(sst.isImsRegistered());

    }



    @FlakyTest

    @Postsubmit

    @Test

    @MediumTest

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

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony;



import android.platform.test.annotations.Postsubmit;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.SmallTest;



import org.junit.After;
@@ -50,6 +51,7 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest { 
        super.tearDown();

    }



    @FlakyTest

    @Postsubmit

    @Test

    @SmallTest
@@ -57,6 +59,7 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest { 
        assertEquals("123", Sms7BitEncodingTranslator.translate("123"));

    }



    @FlakyTest

    @Postsubmit

    @Test

    @SmallTest
@@ -71,6 +74,7 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest { 
        assertEquals("OIA", Sms7BitEncodingTranslator.translate(s));

    }



    @FlakyTest

    @Postsubmit

    @Test

    @SmallTest
@@ -85,6 +89,7 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest { 
        assertEquals("??Ç", Sms7BitEncodingTranslator.translate(s));

    }



    @FlakyTest

    @Postsubmit

    @Test

    @SmallTest

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 


import android.os.Looper;

import android.platform.test.annotations.Postsubmit;

import android.support.test.filters.FlakyTest;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -457,6 +458,7 @@ public class SmsUsageMonitorShortCodeTest extends AndroidTestCase { 
            new ShortCodeTest(null, "112", CATEGORY_NOT_SHORT_CODE),

    };



    @FlakyTest

    @Postsubmit

    @SmallTest

    public void testSmsUsageMonitor() {