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

Commit dfbbb29a authored by Cassie's avatar Cassie
Browse files

Expand use of 'Str' suffix in CellIdentity to 'String' 

Expand use of 'Str' suffix in CellIdentity to 'String' to match general
usage across Android according to the API Review.

Bug: 73751308
Test: Unit test
Change-Id: I4ca7805f77a8eea9a6adbd2c6ceb0c206a3c0a7e
parent 8285290c

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

+16 −16
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ public class CellIdentityGsmTest extends AndroidTestCase { 
        assertEquals(BSIC, ci.getBsic());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertEquals(ALPHA_LONG, ci.getOperatorAlphaLong());

        assertEquals(ALPHA_SHORT, ci.getOperatorAlphaShort());
@@ -70,8 +70,8 @@ public class CellIdentityGsmTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithThreeDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithThreeDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithThreeDigit, ci.getMobileNetworkOperator());

    }
@@ -84,8 +84,8 @@ public class CellIdentityGsmTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithTwoDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithTwoDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithTwoDigit, ci.getMobileNetworkOperator());

    }
@@ -96,32 +96,32 @@ public class CellIdentityGsmTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, MCC_STR, null, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertNull(ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, null, MNC_STR, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncString());

        assertNull(ci.getMccString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityGsm(LAC, CID, ARFCN, BSIC, "", "", ALPHA_LONG, ALPHA_SHORT);



        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());

    }
@@ -136,8 +136,8 @@ public class CellIdentityGsmTest extends AndroidTestCase { 
        assertEquals(Integer.MAX_VALUE, ci.getBsic());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertNull(ci.getOperatorAlphaLong());

        assertNull(ci.getOperatorAlphaShort());

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

+16 −16
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 
        assertEquals(BANDWIDTH, ci.getBandwidth());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertEquals(ALPHA_LONG, ci.getOperatorAlphaLong());

        assertEquals(ALPHA_SHORT, ci.getOperatorAlphaShort());
@@ -71,8 +71,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithThreeDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithThreeDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithThreeDigit, ci.getMobileNetworkOperator());

    }
@@ -85,8 +85,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithTwoDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithTwoDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithTwoDigit, ci.getMobileNetworkOperator());

    }
@@ -97,8 +97,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(
@@ -106,8 +106,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertNull(ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(
@@ -115,8 +115,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncString());

        assertNull(ci.getMccString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityLte(
@@ -124,8 +124,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());

    }
@@ -141,8 +141,8 @@ public class CellIdentityLteTest extends AndroidTestCase { 
        assertEquals(Integer.MAX_VALUE, ci.getBandwidth());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertNull(ci.getOperatorAlphaLong());

        assertNull(ci.getOperatorAlphaShort());

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

+10 −10
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
        CellIdentityTdscdma ci =

                new CellIdentityTdscdma(MCC_STR, MNC_STR, LAC, CID, CPID);



        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(LAC, ci.getLac());

        assertEquals(CID, ci.getCid());

        assertEquals(CPID, ci.getCpid());
@@ -65,23 +65,23 @@ public class CellIdentityTdscdmaTest extends AndroidTestCase { 
    public void testConstructorWithEmptyMccMnc() {

        CellIdentityTdscdma ci = new CellIdentityTdscdma(null, null, LAC, CID, CPID);



        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());



        ci = new CellIdentityTdscdma(MCC_STR, null, LAC, CID, CPID);



        assertEquals(MCC_STR, ci.getMccStr());

        assertNull(ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertNull(ci.getMncString());



        ci = new CellIdentityTdscdma(null, MNC_STR, LAC, CID, CPID);



        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncString());

        assertNull(ci.getMccString());



        ci = new CellIdentityTdscdma("", "", LAC, CID, CPID);



        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

    }



    @SmallTest

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

+16 −16
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
        assertEquals(PSC, ci.getPsc());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertEquals(ALPHA_LONG, ci.getOperatorAlphaLong());

        assertEquals(ALPHA_SHORT, ci.getOperatorAlphaShort());
@@ -68,8 +68,8 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithThreeDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithThreeDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithThreeDigit, ci.getMobileNetworkOperator());

    }
@@ -82,8 +82,8 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 


        assertEquals(MCC, ci.getMcc());

        assertEquals(61, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(mncWithTwoDigit, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(mncWithTwoDigit, ci.getMncString());

        assertEquals(MCC_STR + mncWithTwoDigit, ci.getMobileNetworkOperator());

    }
@@ -95,32 +95,32 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 


        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, MCC_STR, null, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MCC, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertNull(ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, null, MNC_STR, ALPHA_LONG, ALPHA_SHORT);



        assertEquals(MNC, ci.getMnc());

        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(MNC_STR, ci.getMncStr());

        assertNull(ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncString());

        assertNull(ci.getMccString());

        assertNull(ci.getMobileNetworkOperator());



        ci = new CellIdentityWcdma(LAC, CID, PSC, UARFCN, "", "", ALPHA_LONG, ALPHA_SHORT);



        assertEquals(Integer.MAX_VALUE, ci.getMcc());

        assertEquals(Integer.MAX_VALUE, ci.getMnc());

        assertNull(ci.getMccStr());

        assertNull(ci.getMncStr());

        assertNull(ci.getMccString());

        assertNull(ci.getMncString());

        assertNull(ci.getMobileNetworkOperator());

    }
@@ -134,8 +134,8 @@ public class CellIdentityWcdmaTest extends AndroidTestCase { 
        assertEquals(PSC, ci.getPsc());

        assertEquals(MCC, ci.getMcc());

        assertEquals(MNC, ci.getMnc());

        assertEquals(MCC_STR, ci.getMccStr());

        assertEquals(MNC_STR, ci.getMncStr());

        assertEquals(MCC_STR, ci.getMccString());

        assertEquals(MNC_STR, ci.getMncString());

        assertEquals(MCC_STR + MNC_STR, ci.getMobileNetworkOperator());

        assertNull(ci.getOperatorAlphaLong());

        assertNull(ci.getOperatorAlphaShort());