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

Commit d3e039c7 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Add isNonTerrestrialNetwork apis." into udc-qpr-dev

parents 89e0de55 f52a22d3

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

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


package com.android.internal.telephony;



import static com.google.common.truth.Truth.assertThat;



import static junit.framework.Assert.assertEquals;



import android.compat.testing.PlatformCompatChangeRule;
@@ -54,6 +56,7 @@ public class NetworkRegistrationInfoTest { 
                .setAvailableServices(Arrays.asList(NetworkRegistrationInfo.SERVICE_TYPE_DATA))

                .setCellIdentity(new CellIdentityLte())

                .setRegisteredPlmn("12345")

                .setIsNonTerrestrialNetwork(true)

                .build();



        Parcel p = Parcel.obtain();
@@ -70,6 +73,7 @@ public class NetworkRegistrationInfoTest { 
    public void testDefaultValues() {

        NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder().build();

        assertEquals("", nri.getRegisteredPlmn());

        assertThat(nri.isNonTerrestrialNetwork()).isEqualTo(false);

    }



    @Test
@@ -77,6 +81,8 @@ public class NetworkRegistrationInfoTest { 
    public void testBuilder() {

        assertEquals("12345", new NetworkRegistrationInfo.Builder()

                .setRegisteredPlmn("12345").build().getRegisteredPlmn());

        assertThat(new NetworkRegistrationInfo.Builder().setIsNonTerrestrialNetwork(true).build()

                .isNonTerrestrialNetwork()).isEqualTo(true);

    }



    @Test
@@ -139,4 +145,11 @@ public class NetworkRegistrationInfoTest { 
        assertEquals(NetworkRegistrationInfo.REGISTRATION_STATE_EMERGENCY,

                nri.getRegistrationState());

    }



    @Test

    public void testSetIsNonTerrestrialNetwork() {

        NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder().build();

        nri.setIsNonTerrestrialNetwork(true);

        assertThat(nri.isNonTerrestrialNetwork()).isEqualTo(true);

    }

}

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

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


import static android.telephony.ServiceState.UNKNOWN_ID;



import static com.google.common.truth.Truth.assertThat;



import android.os.Bundle;

import android.os.Parcel;

import android.telephony.AccessNetworkConstants;
@@ -444,6 +446,18 @@ public class ServiceStateTest extends TestCase { 
        assertEquals(UNKNOWN_ID, coarseLocationSanitizedSs.getCdmaNetworkId());

    }



    @SmallTest

    public void testIsUsingNonTerrestrialNetwork() {

        ServiceState ss = new ServiceState();

        assertThat(ss.isUsingNonTerrestrialNetwork()).isEqualTo(false);



        NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()

                .setIsNonTerrestrialNetwork(true)

                .build();

        ss.addNetworkRegistrationInfo(nri);

        assertThat(ss.isUsingNonTerrestrialNetwork()).isEqualTo(true);

    }



    private void assertCellIdentitiesSanitized(ServiceState ss) {

        List<NetworkRegistrationInfo> networkRegistrationInfoList =

                ss.getNetworkRegistrationInfoList();