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

Commit 879ffce9 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed the old broken ApnSetting unit tests. 

bug: 25691379
Change-Id: I7315a261ba1a9b80b05edc133d5c2df0897765b9
parent 72623efd

tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java.broken→tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java

100755 → 100644
+22 −22
Original line number Diff line number Diff line
@@ -17,19 +17,16 @@ 
package com.android.internal.telephony;



import android.test.suitebuilder.annotation.SmallTest;

import android.test.MoreAsserts;



import com.android.internal.telephony.dataconnection.ApnSetting;



import junit.framework.TestCase;



import java.util.ArrayList;

import java.util.List;



import junit.framework.TestCase;



public class ApnSettingTest extends TestCase {



    public static final String[] TYPES = {"default", "*"};



    public static void assertApnSettingsEqual(List<ApnSetting> a1, List<ApnSetting> a2) {

        assertEquals(a1.size(), a2.size());

        for (int i = 0; i < a1.size(); ++i) {
@@ -94,22 +91,22 @@ public class ApnSettingTest extends TestCase { 
        assertApnSettingEqual(expectedApn, ApnSetting.fromString(testString));



        // A v2 string with spaces.

        testString = "[ApnSettingV2] Name,apn, ,,,,,,,,123,45,,mms|*,IPV4V6, IP,true,14";

        testString = "[ApnSettingV2] Name,apn, ,,,,,,,,123,45,,mms|*,IPV6, IP,true,14";

        expectedApn = new ApnSetting(

                -1, "12345", "Name", "apn", "", "",

                "", "", "", "", "", 0, mmsTypes, "IPV4V6", "IP", true, 14, 0,

                "", "", "", "", "", 0, mmsTypes, "IPV6", "IP", true, 14, 0,

                0, false, 0, 0, 0, 0, "", "");

        assertApnSettingEqual(expectedApn, ApnSetting.fromString(testString));



        // A v3 string.

        testString = "[ApnSettingV3] Name,apn,,,,,,,,,123,45,,mms|*,IPV6,IP,true,14,,,,,,,spn,testspn";

        expectedApn = new ApnSetting(

                -1, "12345", "Name", "apn", "", "", "", "", "", "", "", 0, mmsTypes, "IPV4V6",

                "IP",true, 14, 0, 0, false, 0, 0, 0, 0, "spn", "testSpn");

                -1, "12345", "Name", "apn", "", "", "", "", "", "", "", 0, mmsTypes, "IPV6",

                "IP",true, 14, 0, 0, false, 0, 0, 0, 0, "spn", "testspn");

        assertApnSettingEqual(expectedApn, ApnSetting.fromString(testString));



        // Return no apn if insufficient fields given.

        testString = "[ApnSettingV2] Name,apn,,,,,,,,,123, 45,,mms|*";

        testString = "[ApnSettingV3] Name,apn,,,,,,,,,123, 45,,mms|*";

        assertEquals(null, ApnSetting.fromString(testString));



        testString = "Name,apn,,,,,,,,,123, 45,";
@@ -119,19 +116,22 @@ public class ApnSettingTest extends TestCase { 
    @SmallTest

    public void testArrayFromString() throws Exception {

        // Test a multiple v3 string.

        String testString = "[ApnSettingV3] Name,apn,,,,,,,,,123,45,,mms|*,IPV6,IP,true,14,,,,,,,spn,testspn";

        testString += " ;[ApnSettingV3] Name1,apn1,,,,,,,,,123,46,,mms|*,IPV6,IP,true,12,,,,,,,gid,testGid";

        testString += " ;[ApnSettingV3] Name1,apn2,,,,,,,,,123,46,,mms|*,IPV6,IP,true,12,,,,,,,,";

        String testString =

                "[ApnSettingV3] Name,apn,,,,,,,,,123,45,,mms,IPV6,IP,true,14,,,,,,,spn,testspn";

        testString +=

                " ;[ApnSettingV3] Name1,apn1,,,,,,,,,123,46,,mms,IPV6,IP,true,12,,,,,,,gid,testGid";

        testString +=

                " ;[ApnSettingV3] Name1,apn2,,,,,,,,,123,46,,mms,IPV6,IP,true,12,,,,,,,,";

        List<ApnSetting> expectedApns = new ArrayList<ApnSetting>();

        expectedApns.add(new ApnSetting(

                -1, "12345", "Name", "apn", "", "", "", "", "", "", "", 0, mmsTypes, "IPV4V6",

                "IP",true, 14, 0, false, 0, 0, 0, 0, "spn", "testSpn"));

                -1, "12345", "Name", "apn", "", "", "", "", "", "", "", 0, new String[]{"mms"}, "IPV6",

                "IP", true, 14, 0, 0, false, 0, 0, 0, 0, "spn", "testspn"));

        expectedApns.add(new ApnSetting(

                -1, "12346", "Name1", "apn1", "", "", "", "", "", "", "", 0, mmsTypes, "IPV4V6",

                "IP",true, 12, 0, false, 0, 0, 0, 0, "gid", "testGid"));

                -1, "12346", "Name1", "apn1", "", "", "", "", "", "", "", 0, new String[]{"mms"}, "IPV6",

                "IP", true, 12, 0, 0, false, 0, 0, 0, 0, "gid", "testGid"));

        expectedApns.add(new ApnSetting(

                -1, "12346", "Name1", "apn2", "", "", "", "", "", "", "", 0, mmsTypes, "IPV4V6",

                "IP",true, 12, 0, false, 0, 0, 0, 0, "", ""));

                -1, "12346", "Name1", "apn2", "", "", "", "", "", "", "", 0, new String[]{"mms"}, "IPV6",

                "IP", true, 12, 0, 0, false, 0, 0, 0, 0, "", ""));

        assertApnSettingsEqual(expectedApns, ApnSetting.arrayFromString(testString));

    }
@@ -141,10 +141,10 @@ public class ApnSettingTest extends TestCase { 
        ApnSetting apn =  new ApnSetting(

                99, "12345", "Name", "apn", "proxy", "port",

                "mmsc", "mmsproxy", "mmsport", "user", "password", 0,

                types, "IPV4V6", "IP", true, 14, 0, 0, false, 0, 0, 0, 0, "", "");

        String expected = "[ApnSettingV2] Name, 99, 12345, apn, proxy, " +

                types, "IPV6", "IP", true, 14, 0, 0, false, 0, 0, 0, 0, "", "");

        String expected = "[ApnSettingV3] Name, 99, 12345, apn, proxy, " +

                "mmsc, mmsproxy, mmsport, port, 0, default | *, " +

                "IPV4V6, IP, true, 14, 0, false, 0, 0, 0, 0, , ";

                "IPV6, IP, true, 14, 8192, 0, false, 0, 0, 0, 0, , , false";

        assertEquals(expected, apn.toString());

    }

}