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

Commit 9af9bc9b authored by Jack Yu's avatar Jack Yu
Browse files

resolve merge conflicts of cf93cbb0 to nyc-mr2-dev-plus-aosp 

Test: unit test
Change-Id: If11d63bc2d76985f8507236ab6e1ca274d8271a3
parents 59471260 cf93cbb0

src/java/com/android/internal/telephony/dataconnection/ApnSetting.java

+3 −0
Original line number Diff line number Diff line
@@ -486,7 +486,10 @@ public class ApnSetting { 
                proxy.equals(other.proxy) &&

                mmsc.equals(other.mmsc) &&

                mmsProxy.equals(other.mmsProxy) &&

                TextUtils.equals(mmsPort, other.mmsPort) &&

                port.equals(other.port) &&

                TextUtils.equals(user, other.user) &&

                TextUtils.equals(password, other.password) &&

                authType == other.authType &&

                Arrays.deepEquals(types, other.types) &&

                protocol.equals(other.protocol) &&

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

+40 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import org.junit.Assert; 
import org.junit.Before;

import org.junit.Test;



import java.lang.reflect.Field;

import java.lang.reflect.Modifier;

import java.util.ArrayList;

import java.util.List;
@@ -39,6 +41,7 @@ import static com.android.internal.telephony.PhoneConstants.APN_TYPE_MMS; 
import static com.android.internal.telephony.PhoneConstants.APN_TYPE_SUPL;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;

import static org.junit.Assert.assertEquals;
@@ -588,4 +591,41 @@ public class ApnSettingTest extends TelephonyTest { 
                {APN_TYPE_DEFAULT, APN_TYPE_MMS, APN_TYPE_IA}).

                canHandleType(APN_TYPE_IA));

    }



    @Test

    @SmallTest

    public void testEquals() throws Exception {

        final int dummyInt = 1;

        final String dummyString = "dummy";

        final String[] dummyStringArr = new String[] {"dummy"};

        // base apn

        ApnSetting baseApn = createApnSetting(new String[] {"mms", "default"});

        Field[] fields = ApnSetting.class.getDeclaredFields();

        for (Field f : fields) {

            int modifiers = f.getModifiers();

            if (Modifier.isStatic(modifiers) || !Modifier.isFinal(modifiers)) {

                continue;

            }

            f.setAccessible(true);

            ApnSetting testApn = null;

            if (int.class.equals(f.getType())) {

                testApn = new ApnSetting(baseApn);

                f.setInt(testApn, dummyInt + f.getInt(testApn));

            } else if (boolean.class.equals(f.getType())) {

                testApn = new ApnSetting(baseApn);

                f.setBoolean(testApn, !f.getBoolean(testApn));

            } else if (String.class.equals(f.getType())) {

                testApn = new ApnSetting(baseApn);

                f.set(testApn, dummyString);

            } else if (String[].class.equals(f.getType())) {

                testApn = new ApnSetting(baseApn);

                f.set(testApn, dummyStringArr);

            } else {

                fail("Unsupported field:" + f.getName());

            }

            if (testApn != null) {

                assertFalse(f.getName() + " is NOT checked", testApn.equals(baseApn));

            }

        }

    }

}