Merge "Remove old @Postsubmit annotation" (9947f6e1) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,6 @@
	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.os.HandlerThread;		import android.os.HandlerThread;
	import android.os.PersistableBundle;
	import android.telephony.CarrierConfigManager;
	import android.platform.test.annotations.Postsubmit;
	import android.support.test.filters.FlakyTest;		import android.support.test.filters.FlakyTest;
	import android.telephony.DisconnectCause;		import android.telephony.DisconnectCause;
	import android.telephony.PhoneNumberUtils;		import android.telephony.PhoneNumberUtils;
	@@ -177,6 +174,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest {

	}		}

			@FlakyTest
	@Test		@Test
	@MediumTest		@MediumTest
	public void testMOCallPendingHangUp() {		public void testMOCallPendingHangUp() {

+1 −3

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

	import android.net.Uri;		import android.net.Uri;
	import android.platform.test.annotations.Postsubmit;
	import android.support.test.filters.FlakyTest;		import android.support.test.filters.FlakyTest;
	import android.telephony.PhoneNumberUtils;		import android.telephony.PhoneNumberUtils;
	import android.test.AndroidTestCase;		import android.test.AndroidTestCase;
	@@ -415,7 +414,6 @@ public class PhoneNumberUtilsTest extends AndroidTestCase {

	// To run this test, the device has to be registered with network		// To run this test, the device has to be registered with network
	@FlakyTest		@FlakyTest
	@Postsubmit
	public void testCheckAndProcessPlusCode() {		public void testCheckAndProcessPlusCode() {
	assertEquals("0118475797000",		assertEquals("0118475797000",
	PhoneNumberUtils.cdmaCheckAndProcessPlusCode("+8475797000"));		PhoneNumberUtils.cdmaCheckAndProcessPlusCode("+8475797000"));
	@@ -586,7 +584,7 @@ public class PhoneNumberUtilsTest extends AndroidTestCase {
	PhoneNumberUtils.formatNumber("011861088880000", "", "GB"));		PhoneNumberUtils.formatNumber("011861088880000", "", "GB"));
	}		}

	@Postsubmit		@FlakyTest
	@SmallTest		@SmallTest
	public void testIsEmergencyNumber() {		public void testIsEmergencyNumber() {
	// There are two parallel sets of tests here: one for the		// There are two parallel sets of tests here: one for the

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,6 @@ import android.os.Parcel;
	import android.os.Process;		import android.os.Process;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.WorkSource;		import android.os.WorkSource;
	import android.platform.test.annotations.Postsubmit;
	import android.support.test.filters.FlakyTest;		import android.support.test.filters.FlakyTest;
	import android.telephony.CellInfo;		import android.telephony.CellInfo;
	import android.telephony.CellInfoGsm;		import android.telephony.CellInfoGsm;
	@@ -317,6 +316,7 @@ public class ServiceStateTrackerTest extends TelephonyTest {
	assertFalse(sst.isImsRegistered());		assertFalse(sst.isImsRegistered());
	}		}

			@FlakyTest
	@Test		@Test
	@MediumTest		@MediumTest
	public void testSignalStrength() {		public void testSignalStrength() {

+0 −5

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

	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.platform.test.annotations.Postsubmit;
	import android.support.test.filters.FlakyTest;		import android.support.test.filters.FlakyTest;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;

	@@ -52,7 +51,6 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest {
	}		}

	@FlakyTest		@FlakyTest
	@Postsubmit
	@Test		@Test
	@SmallTest		@SmallTest
	public void testNoTranslate() {		public void testNoTranslate() {
	@@ -60,7 +58,6 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest {
	}		}

	@FlakyTest		@FlakyTest
	@Postsubmit
	@Test		@Test
	@SmallTest		@SmallTest
	public void testCommonTranslate() {		public void testCommonTranslate() {
	@@ -75,7 +72,6 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest {
	}		}

	@FlakyTest		@FlakyTest
	@Postsubmit
	@Test		@Test
	@SmallTest		@SmallTest
	public void testGsmTranslate() {		public void testGsmTranslate() {
	@@ -90,7 +86,6 @@ public class Sms7BitEncodingTranslatorTest extends TelephonyTest {
	}		}

	@FlakyTest		@FlakyTest
	@Postsubmit
	@Test		@Test
	@SmallTest		@SmallTest
	public void testCdmaTranslate() {		public void testCdmaTranslate() {

+0 −2

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

	import android.os.Looper;		import android.os.Looper;
	import android.platform.test.annotations.Postsubmit;
	import android.support.test.filters.FlakyTest;		import android.support.test.filters.FlakyTest;
	import android.test.AndroidTestCase;		import android.test.AndroidTestCase;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;
	@@ -459,7 +458,6 @@ public class SmsUsageMonitorShortCodeTest extends AndroidTestCase {
	};		};

	@FlakyTest		@FlakyTest
	@Postsubmit
	@SmallTest		@SmallTest
	public void testSmsUsageMonitor() {		public void testSmsUsageMonitor() {
	// InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.		// InstrumentationTestRunner prepares a looper, but AndroidJUnitRunner does not.