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

Commit d4e4c8b5 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed unit test cases" into nyc-dev

parents d3587db8 0c0816c7

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

+0 −12
Original line number Diff line number Diff line
@@ -468,18 +468,6 @@ public class PhoneNumberUtilsTest extends AndroidTestCase { 
        assertEquals("18475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeByNumberFormat("+18475797000",

                PhoneNumberUtils.FORMAT_NANP,PhoneNumberUtils.FORMAT_NANP));

        assertEquals("+18475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeByNumberFormat("+18475797000",

                PhoneNumberUtils.FORMAT_NANP,PhoneNumberUtils.FORMAT_JAPAN));

        assertEquals("+18475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeByNumberFormat("+18475797000",

                PhoneNumberUtils.FORMAT_NANP,PhoneNumberUtils.FORMAT_UNKNOWN));

        assertEquals("+18475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeByNumberFormat("+18475797000",

                PhoneNumberUtils.FORMAT_JAPAN,PhoneNumberUtils.FORMAT_JAPAN));

        assertEquals("+18475797000",

                PhoneNumberUtils.cdmaCheckAndProcessPlusCodeByNumberFormat("+18475797000",

                PhoneNumberUtils.FORMAT_UNKNOWN,PhoneNumberUtils.FORMAT_UNKNOWN));

    }



    /**

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

+4 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import android.os.IBinder;

import android.test.suitebuilder.annotation.SmallTest;



import org.junit.After;
@@ -28,18 +27,20 @@ import java.io.UnsupportedEncodingException; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doReturn;



public class Sms7BitEncodingTranslatorTest extends TelephonyTest {



    @Mock

    IBinder mBinder;

    UiccSmsController mUiccSmsController;



    @Before

    public void setUp() throws Exception {

        logd("+Setup!");

        super.setUp(getClass().getSimpleName());



        mServiceManagerMockedServices.put("isms", mUiccSmsController);

        doReturn(false).when(mUiccSmsController).isImsSmsSupportedForSubscriber(anyInt());

        logd("-Setup!");

    }