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

Commit a24632b9 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Cleanup CDMA unit tests 

Bug: 379356026
Test: CellIdentityCdmaTest
Test: CellSignalStrengthCdmaTest
Test: SignalStrengthControllerTest
Test: SignalStrengthTest
Flag: com.android.internal.telephony.flags.cleanup_cdma
Change-Id: I75777a945cdb56b57934aa9e02acb7af57eb717d
parent ac4622f2

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

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.test.AndroidTestCase; 


import androidx.test.filters.SmallTest;



import com.android.internal.telephony.flags.Flags;



/** Unit tests for {@link CellIdentityCdma}. */



public class CellIdentityCdmaTest extends AndroidTestCase {
@@ -44,6 +46,7 @@ public class CellIdentityCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testConstructor() {

        if (Flags.cleanupCdma()) return;

        CellIdentityCdma  ci =

                new CellIdentityCdma(NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,

                        ALPHA_LONG, ALPHA_SHORT);
@@ -61,6 +64,7 @@ public class CellIdentityCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testNullIsland() {

        if (Flags.cleanupCdma()) return;

        CellIdentityCdma  ci =

                new CellIdentityCdma(NETWORK_ID, SYSTEM_ID, BASESTATION_ID, -1, 0,

                        ALPHA_LONG, ALPHA_SHORT);
@@ -71,6 +75,7 @@ public class CellIdentityCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testEquals() {

        if (Flags.cleanupCdma()) return;

        CellIdentityCdma  ciA =

                new CellIdentityCdma(NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,

                        ALPHA_LONG, ALPHA_SHORT);
@@ -97,6 +102,7 @@ public class CellIdentityCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testParcel() {

        if (Flags.cleanupCdma()) return;

        CellIdentityCdma  ci =

                new CellIdentityCdma(NETWORK_ID, SYSTEM_ID, BASESTATION_ID, LONGITUDE, LATITUDE,

                        ALPHA_LONG, ALPHA_SHORT);

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

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.test.AndroidTestCase; 


import androidx.test.filters.SmallTest;



import com.android.internal.telephony.flags.Flags;



/** Unit tests for {@link CellSignalStrengthCdma}. */



public class CellSignalStrengthCdmaTest extends AndroidTestCase {
@@ -38,6 +40,7 @@ public class CellSignalStrengthCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testConstructor() {

        if (Flags.cleanupCdma()) return;

        CellSignalStrengthCdma css = new CellSignalStrengthCdma(

                CDMA_DBM, CDMA_ECIO, EVDO_DBM, EVDO_ECIO, EVDO_SNR);

        assertEquals(CDMA_DBM, css.getCdmaDbm());
@@ -49,6 +52,7 @@ public class CellSignalStrengthCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testInvalidConstructor() {

        if (Flags.cleanupCdma()) return;

        CellSignalStrengthCdma css = new CellSignalStrengthCdma(200, 2000, 20, 400, 200);

        assertEquals(Integer.MAX_VALUE, css.getCdmaDbm());

        assertEquals(Integer.MAX_VALUE, css.getCdmaEcio());
@@ -59,6 +63,7 @@ public class CellSignalStrengthCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testDefaultConstructor() {

        if (Flags.cleanupCdma()) return;

        CellSignalStrengthCdma css = new CellSignalStrengthCdma();

        assertEquals(Integer.MAX_VALUE, css.getCdmaDbm());

        assertEquals(Integer.MAX_VALUE, css.getCdmaEcio());
@@ -69,6 +74,7 @@ public class CellSignalStrengthCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testEquals() {

        if (Flags.cleanupCdma()) return;

        assertTrue(new CellSignalStrengthCdma(

                CDMA_DBM, CDMA_ECIO, EVDO_DBM, EVDO_ECIO, EVDO_SNR).equals(

                        new CellSignalStrengthCdma(
@@ -80,6 +86,7 @@ public class CellSignalStrengthCdmaTest extends AndroidTestCase { 


    @SmallTest

    public void testParcel() {

        if (Flags.cleanupCdma()) return;

        CellSignalStrengthCdma css = new CellSignalStrengthCdma(

                CDMA_DBM, CDMA_ECIO, EVDO_DBM, EVDO_ECIO, EVDO_SNR);

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

+16 −13
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import android.testing.TestableLooper; 


import androidx.test.filters.MediumTest;



import com.android.internal.telephony.flags.Flags;

import com.android.internal.util.ArrayUtils;



import org.junit.After;
@@ -470,6 +471,7 @@ public class SignalStrengthControllerTest extends TelephonyTest { 
        assertEquals(mSsc.getSignalStrength(), ss);

        assertEquals(mSsc.getSignalStrength().isGsm(), true);



        if (!Flags.cleanupCdma()) {

            // Send in CDMA-only Signal Strength Info and expect isGsm == false

            ss = new SignalStrength(

                    new CellSignalStrengthCdma(-90, -12,
@@ -484,6 +486,7 @@ public class SignalStrengthControllerTest extends TelephonyTest { 
            assertEquals(mSsc.getSignalStrength(), ss);

            assertEquals(mSsc.getSignalStrength().isGsm(), false);

        }

    }



    @Test

    public void testLteSignalStrengthReportingCriteria() {

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

+4 −5
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class SignalStrengthTest { 
        ArrayList<Byte> NrCqiReport = new ArrayList<>(

                Arrays.asList((byte) 3, (byte) 2 , (byte) 1));

        SignalStrength s = new SignalStrength(

                new CellSignalStrengthCdma(-93, -132, -89, -125, 5),

                new CellSignalStrengthCdma(),

                new CellSignalStrengthGsm(-79, 2, 5),

                new CellSignalStrengthWcdma(-94, 4, -102, -5),

                new CellSignalStrengthTdscdma(-95, 2, -103),
@@ -175,7 +175,6 @@ public class SignalStrengthTest { 
    public void testGetCellSignalStrengths() throws Exception {

        CellSignalStrengthLte lte = new CellSignalStrengthLte(-85, -91, -6, -10, 1, 12, 1);

        CellSignalStrengthGsm gsm = new CellSignalStrengthGsm(-79, 2, 5);

        CellSignalStrengthCdma cdma = new CellSignalStrengthCdma(-93, -132, -89, -125, 5);

        CellSignalStrengthWcdma wcdma = new CellSignalStrengthWcdma(-94, 4, -102, -5);

        CellSignalStrengthTdscdma tdscdma = new CellSignalStrengthTdscdma(-95, 2, -103);
@@ -194,16 +193,16 @@ public class SignalStrengthTest { 


        // Test that a multiple objects are properly stored and returned by getCellSignalStrengths()

        s = new SignalStrength(

                cdma,

                new CellSignalStrengthCdma(),

                new CellSignalStrengthGsm(),

                new CellSignalStrengthWcdma(),

                wcdma,

                new CellSignalStrengthTdscdma(),

                lte,

                new CellSignalStrengthNr());



        css = s.getCellSignalStrengths();

        assertEquals(2, css.size());

        assertTrue(css.contains(cdma));

        assertTrue(css.contains(wcdma));

        assertTrue(css.contains(lte));

    }