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

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

Merge "Extract hostname if mMmsProxyAddress starts with http." into tm-qpr-dev

parents 0c190d27 94cba63f

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java

+50 −0
Original line number Diff line number Diff line
@@ -540,4 +540,54 @@ public class ApnSettingTest extends TelephonyTest { 


        parcel.recycle();

    }



    @Test

    public void testBuild_mmsProxyAddrStartsWithHttp() {

        ApnSetting apn1 = new ApnSetting.Builder()

                .setId(1234)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_UMTS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("http://proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn1.getMmsProxyAddressAsString());



        ApnSetting apn2 = new ApnSetting.Builder()

                .setId(1235)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setRoamingProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_EDGE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("https://proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn2.getMmsProxyAddressAsString());



        ApnSetting apn3 = new ApnSetting.Builder()

                .setId(1236)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setRoamingProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_EDGE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn3.getMmsProxyAddressAsString());

    }

}