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

Commit 975af40e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark flaky/failing tests as @Postsubmit." into nyc-mr1-dev

parents 9c1c0e03 38ea8753

tests/telephonytests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common services.core

LOCAL_STATIC_JAVA_LIBRARIES := guava \

                               mockito-target \

                               android-support-test

                               android-support-test \

                               platform-test-annotations



LOCAL_PACKAGE_NAME := FrameworksTelephonyTests

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Message; 
import android.os.Parcel;

import android.os.SystemClock;

import android.os.UserHandle;

import android.platform.test.annotations.Postsubmit;

import android.telephony.CellInfo;

import android.telephony.CellInfoGsm;

import android.telephony.ServiceState;
@@ -184,6 +185,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertTrue(sst.getPowerStateFromCarrier());

    }



    @Postsubmit

    @Test

    @MediumTest

    public void testNoRilTrafficAfterSetRadioPower() {

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

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


package com.android.internal.telephony;



import android.platform.test.annotations.Postsubmit;

import android.test.suitebuilder.annotation.SmallTest;



import org.junit.After;
@@ -49,12 +50,14 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest { 
        super.tearDown();

    }



    @Postsubmit

    @Test

    @SmallTest

    public void testNoTranslate() {

        assertEquals("123", Sms7BitEncodingTranslator.translate("123"));

    }



    @Postsubmit

    @Test

    @SmallTest

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

    }



    @Postsubmit

    @Test

    @SmallTest

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

    }



    @Postsubmit

    @Test

    @SmallTest

    public void testCdmaTranslate() {

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

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



import android.os.Looper;

import android.platform.test.annotations.Postsubmit;

import android.test.AndroidTestCase;

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

    };



    @Postsubmit

    @SmallTest

    public void testSmsUsageMonitor() {

        // InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.

tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java

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

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.annotations.Postsubmit;

import android.provider.Telephony;

import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.MediumTest;
@@ -159,6 +160,7 @@ public class CdmaInboundSmsHandlerTest extends TelephonyTest { 
        assertEquals("IdleState", getCurrentState().getName());

    }



    @Postsubmit

    @Test

    @MediumTest

    public void testNewSms() {