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

Commit 0c1b2a85 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add tests for network controller" am: 17bcd2ea 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1571051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf1e32b5b6c6a2e52f5eca79fd1968f5a285e9ab
parents 6be17fa4 17bcd2ea

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

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



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;



import android.content.Intent;
@@ -107,8 +108,6 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


    @Test

    public void testUpdateOverrideNetworkTypeNrNsa() throws Exception {

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();



        // not NR

        doReturn(NetworkRegistrationInfo.NR_STATE_NONE).when(mServiceState).getNrState();

        updateOverrideNetworkType();
@@ -143,8 +142,6 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


    @Test

    public void testUpdateOverrideNetworkTypeLte() throws Exception {

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();



        // normal LTE

        updateOverrideNetworkType();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,
@@ -173,6 +170,22 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
                mNetworkTypeController.getOverrideNetworkType());

    }



    @Test

    public void testUpdateOverrideNetworkType() throws Exception {

        doReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED).when(mServiceState).getNrState();

        doReturn(ServiceState.FREQUENCY_RANGE_LOW).when(mServiceState).getNrFrequencyRange();

        NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()

                .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_HSPAP)

                .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)

                .build();

        doReturn(nri).when(mServiceState).getNetworkRegistrationInfo(anyInt(), anyInt());

        updateOverrideNetworkType();



        // override shouldn't be NR if not on LTE despite NR_STATE_CONNECTED

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());

    }



    @Test

    public void testTransitionToCurrentStateLegacy() throws Exception {

        assertEquals("DefaultState", getCurrentState().getName());