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

Commit 06d5040c authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update tests for NR signal strength" into tm-qpr-dev am: b2718ed0 am: 9f2c0a79 

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



Change-Id: I8a705ad3d01f9896462162db942e31b4ec36e707
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43066e18 9f2c0a79

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

+6 −6
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class CellSignalStrengthNrTest extends TelephonyTest { 


    private List<Integer> getCsiCqiList() {

        return CSICQI_REPORT.stream()

                .map(cqi -> new Integer(Byte.toUnsignedInt(cqi)))

                .map(Byte::toUnsignedInt)

                .collect(Collectors.toList());

    }
@@ -188,7 +188,7 @@ public class CellSignalStrengthNrTest extends TelephonyTest { 
    @Test

    public void testAsuLevel_invalidValue() {

        // GIVEN an instance of CellSignalStrengthNr with invalid csirsrp

        CellSignalStrengthNr css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR,

        CellSignalStrengthNr css = new CellSignalStrengthNr(INVALID_CSIRSRP, CSIRSRQ, CSISINR,

                CSICQI_TABLE_INDEX, CSICQI_REPORT, INVALID_SSRSRP, SSRSRQ, SSSINR);



        // THEN the asu level is unknown
@@ -197,10 +197,10 @@ public class CellSignalStrengthNrTest extends TelephonyTest { 


    @Test

    public void testSignalLevel_validValue() {

        for (int ssRsrp = -140; ssRsrp <= -44; ssRsrp++) {

        for (int ssRsrp = -156; ssRsrp <= -31; ssRsrp++) {

            // GIVEN an instance of CellSignalStrengthNr with valid csirsrp

            CellSignalStrengthNr css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR,

                    CSICQI_TABLE_INDEX, CSICQI_REPORT, INVALID_SSRSRP, SSRSRQ, SSSINR);

                    CSICQI_TABLE_INDEX, CSICQI_REPORT, ssRsrp, SSRSRQ, SSSINR);



            // THEN the signal level is valid

            assertThat(css.getLevel()).isIn(Range.range(
@@ -212,7 +212,7 @@ public class CellSignalStrengthNrTest extends TelephonyTest { 
    @Test

    public void testSignalLevel_invalidValue() {

        // GIVEN an instance of CellSignalStrengthNr with invalid csirsrp

        CellSignalStrengthNr css = new CellSignalStrengthNr(CSIRSRP, CSIRSRQ, CSISINR,

        CellSignalStrengthNr css = new CellSignalStrengthNr(INVALID_CSIRSRP, CSIRSRQ, CSISINR,

                CSICQI_TABLE_INDEX, CSICQI_REPORT, SSRSRP, SSRSRQ, SSSINR);



        // THEN the signal level is unknown
@@ -259,7 +259,7 @@ public class CellSignalStrengthNrTest extends TelephonyTest { 
    }



    @Test

    public void testSignalLevel_ThresholdBoundaries() {

    public void testSignalLevel_thresholdBoundaries() {

        int[] ssRsrpThresholds = {

                -110, /* SIGNAL_STRENGTH_POOR */

                -90,  /* SIGNAL_STRENGTH_MODERATE */