Merge "Add CTS test for new roaming state APIs in NetworkRegistrationInfo"
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/NetworkRegistrationInfoTest.java b/tests/tests/telephony/current/src/android/telephony/cts/NetworkRegistrationInfoTest.java
index f5a8477..adee163 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/NetworkRegistrationInfoTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/NetworkRegistrationInfoTest.java
@@ -101,10 +101,11 @@
NetworkRegistrationInfo.SERVICE_TYPE_VOICE), nri.getAvailableServices());
}
- /**
+ /**
* Basic test to ensure {@link NetworkRegistrationInfo#isSearching()} does not throw any
* exception.
*/
+ @SuppressWarnings("deprecation")
@Test
public void testNetworkRegistrationInfoIsSearching() {
NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
@@ -114,6 +115,18 @@
assertTrue(nri.isSearching());
}
+ /**
+ * Basic test to ensure {@link NetworkRegistrationInfo#isNetworkSearching()} does not throw any
+ * exception.
+ */
+ @Test
+ public void testNetworkRegistrationInfoIsNetworkSearching() {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(
+ NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_SEARCHING)
+ .build();
+ assertTrue(nri.isNetworkSearching());
+ }
@Test
public void testGetDomain() {
@@ -123,6 +136,7 @@
assertEquals(NetworkRegistrationInfo.DOMAIN_CS, nri.getDomain());
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetRegistrationState() {
NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
@@ -132,6 +146,16 @@
}
@Test
+ public void testGetNetworkRegistrationState() {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING)
+ .build();
+ nri.setRoamingType(NetworkRegistrationInfo.REGISTRATION_STATE_HOME);
+ assertEquals(NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING,
+ nri.getNetworkRegistrationState());
+ }
+
+ @Test
public void testGetTransportType() {
NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
@@ -175,6 +199,10 @@
assertEquals(ci, nri.getCellIdentity());
}
+ /**
+ * Test {@link NetworkRegistrationInfo#isRegistered()} to support backward compatibility.
+ */
+ @SuppressWarnings("deprecation")
@Test
public void testIsRegistered() {
final int[] registeredStates = new int[] {NetworkRegistrationInfo.REGISTRATION_STATE_HOME,
@@ -200,14 +228,67 @@
}
@Test
+ public void testIsNetworkRegistered() {
+ final int[] registeredStates = new int[] {NetworkRegistrationInfo.REGISTRATION_STATE_HOME,
+ NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING};
+ for (int state : registeredStates) {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(state)
+ .build();
+ assertTrue(nri.isNetworkRegistered());
+ }
+
+ final int[] unregisteredStates = new int[] {
+ NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING,
+ NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_SEARCHING,
+ NetworkRegistrationInfo.REGISTRATION_STATE_DENIED,
+ NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN};
+ for (int state : unregisteredStates) {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(state)
+ .build();
+ assertFalse(nri.isNetworkRegistered());
+ }
+ }
+
+ /**
+ * Test {@link NetworkRegistrationInfo#isSearching()} to support backward compatibility.
+ */
+ @SuppressWarnings("deprecation")
+ @Test
public void testIsSearching() {
final int[] isSearchingStates = new int[] {
+ NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_SEARCHING};
+ for (int state : isSearchingStates) {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(state)
+ .build();
+ assertTrue(nri.isSearching());
+ }
+
+ final int[] isNotSearchingStates = new int[] {
+ NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING,
+ NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING,
+ NetworkRegistrationInfo.REGISTRATION_STATE_HOME,
+ NetworkRegistrationInfo.REGISTRATION_STATE_DENIED,
+ NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN};
+ for (int state : isNotSearchingStates) {
+ NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+ .setRegistrationState(state)
+ .build();
+ assertFalse(nri.isSearching());
+ }
+ }
+
+ @Test
+ public void testIsNetworkSearching() {
+ final int[] isSearchingStates = new int[] {
NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_SEARCHING};
for (int state : isSearchingStates) {
NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
.setRegistrationState(state)
.build();
- assertTrue(nri.isSearching());
+ assertTrue(nri.isNetworkSearching());
}
final int[] isNotSearchingStates = new int[] {
@@ -220,7 +301,7 @@
NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
.setRegistrationState(state)
.build();
- assertFalse(nri.isSearching());
+ assertFalse(nri.isNetworkSearching());
}
}
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyDisplayInfoTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyDisplayInfoTest.java
index 43c8be7..148c540 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyDisplayInfoTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyDisplayInfoTest.java
@@ -30,10 +30,12 @@
Parcel p = Parcel.obtain();
p.writeInt(1);
p.writeInt(2);
+ p.writeBoolean(false);
p.setDataPosition(0);
TelephonyDisplayInfo tdi = TelephonyDisplayInfo.CREATOR.createFromParcel(p);
assertEquals(1, tdi.getNetworkType());
assertEquals(2, tdi.getOverrideNetworkType());
+ assertEquals(false, tdi.isRoaming());
}
}
