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

Commit 703e603f authored by fionaxu's avatar fionaxu
Browse files

Telephony Unit Test Clean Up 

bug: 25691379

Change-Id: Ic5b424d8bed2229efe32379090053561496f78fa
parent 3d141ae1

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

+11 −11
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ public class CallManagerTest extends TelephonyTest { 


    @SmallTest @Test

    public void testSanity() {

        assertEquals(CallManager.getInstance().getDefaultPhone(), mPhone);

        assertEquals(mPhone, CallManager.getInstance().getDefaultPhone());

        assertFalse(CallManager.getInstance().hasActiveBgCall());

        assertFalse(CallManager.getInstance().hasActiveRingingCall());

        assertFalse(CallManager.getInstance().hasActiveFgCall());

        /* return the default phone if there is no any active call */

        assertEquals(CallManager.getInstance().getRingingPhone(), mPhone);

        assertEquals(CallManager.getInstance().getBgPhone(), mPhone);

        assertEquals(CallManager.getInstance().getFgPhone(), mPhone);

        assertEquals(mPhone, CallManager.getInstance().getRingingPhone());

        assertEquals(mPhone, CallManager.getInstance().getBgPhone());

        assertEquals(mPhone, CallManager.getInstance().getFgPhone());

    }



    @SmallTest @Test
@@ -114,9 +114,9 @@ public class CallManagerTest extends TelephonyTest { 
            ArgumentCaptor<String> mCaptorString = ArgumentCaptor.forClass(String.class);

            ArgumentCaptor<Integer> mCaptorInt = ArgumentCaptor.forClass(Integer.class);

            verify(mPhone, times(1)).dial(mCaptorString.capture(), mCaptorInt.capture());

            assertEquals(mCaptorString.getValue(),

                    PhoneNumberUtils.stripSeparators("+17005554141"));

            assertEquals(mCaptorInt.getValue().intValue(), 0);

            assertEquals(PhoneNumberUtils.stripSeparators("+17005554141"),

                    mCaptorString.getValue());

            assertEquals(0, mCaptorInt.getValue().intValue());



        } catch (Exception ex) {

            ex.printStackTrace();
@@ -153,7 +153,7 @@ public class CallManagerTest extends TelephonyTest { 
        CallManager.getInstance().sendDtmf('a');

        verify(mPhone, times(0)).sendDtmf(eq('a'));

        doReturn(false).when(mFgCall).isIdle();

        assertEquals(CallManager.getInstance().getActiveFgCall(), mFgCall);

        assertEquals(mFgCall, CallManager.getInstance().getActiveFgCall());

        CallManager.getInstance().sendDtmf('a');

        verify(mPhone, times(1)).sendDtmf(eq('a'));

    }
@@ -231,9 +231,9 @@ public class CallManagerTest extends TelephonyTest { 
            ArgumentCaptor<Integer> mCaptorInt = ArgumentCaptor.forClass(Integer.class);



            verify(mPhone, times(1)).dial(mCaptorString.capture(), mCaptorInt.capture());

            assertEquals(mCaptorString.getValue(),

                    PhoneNumberUtils.stripSeparators("+17005554141"));

            assertEquals(mCaptorInt.getValue().intValue(), 0);

            assertEquals(PhoneNumberUtils.stripSeparators("+17005554141"),

                    mCaptorString.getValue());

            assertEquals(0, mCaptorInt.getValue().intValue());



        } catch (Exception ex) {

            ex.printStackTrace();

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

+4 −4
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ public class CallStateExceptionTest { 
    @SmallTest

    public void testCallStateExceptionDefault() {

        mCallStateException = new CallStateException("sanity test");

        assertEquals(mCallStateException.getMessage(), "sanity test");

        assertEquals(mCallStateException.getError(), mCallStateException.ERROR_INVALID);

        assertEquals("sanity test", mCallStateException.getMessage());

        assertEquals(mCallStateException.ERROR_INVALID, mCallStateException.getError());

    }



    @Test
@@ -41,7 +41,7 @@ public class CallStateExceptionTest { 
    public void testCallStateExceptionWithErrCode() {

        mCallStateException = new CallStateException(mCallStateException.ERROR_DISCONNECTED,

                                                     "sanity test with err code");

        assertEquals(mCallStateException.getMessage(), "sanity test with err code");

        assertEquals(mCallStateException.getError(), mCallStateException.ERROR_DISCONNECTED);

        assertEquals("sanity test with err code", mCallStateException.getMessage());

        assertEquals(mCallStateException.ERROR_DISCONNECTED, mCallStateException.getError());

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
            ex.printStackTrace();

            Assert.fail("unexpected exception thrown" + ex.getMessage());

        }

        assertEquals(GsmCdmaCall.State.DISCONNECTING, mCTUT.mForegroundCall.getState());

        /* request send to RIL still in disconnecting state */

        waitForMs(50);

        assertEquals(GsmCdmaCall.State.IDLE, mCTUT.mForegroundCall.getState());

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

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ public class GsmCdmaConnectionTest extends TelephonyTest { 
        logd("Process the post dial sequence with wait ");

        assertEquals(Connection.PostDialState.WAIT, connection.getPostDialState());

        connection.proceedAfterWaitChar();

        assertEquals(Connection.PostDialState.STARTED, connection.getPostDialState());

        waitForMs(50);

        assertEquals(Connection.PostDialState.COMPLETE, connection.getPostDialState());

    }

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

+9 −8
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ public class SignalToneUtilTest { 
                SignalToneUtil.IS95_CONST_IR_SIGNAL_IS54B,

                SignalToneUtil.IS95_CONST_IR_ALERT_LOW,

                SignalToneUtil.IS95_CONST_IR_SIG_IS54B_L);

        assertEquals(audioToneResult, ToneGenerator.TONE_CDMA_LOW_L);

        assertEquals(ToneGenerator.TONE_CDMA_LOW_L, audioToneResult);



        audioToneResult = SignalToneUtil.getAudioToneFromSignalInfo(

                SignalToneUtil.IS95_CONST_IR_SIGNAL_TONE,

                SignalToneUtil.IS95_CONST_IR_ALERT_LOW,

                SignalToneUtil.IS95_CONST_IR_SIG_TONE_DIAL);

        assertEquals(audioToneResult, ToneGenerator.TONE_CDMA_DIAL_TONE_LITE);

        assertEquals(ToneGenerator.TONE_CDMA_DIAL_TONE_LITE, audioToneResult);

        /* if signal type is not IS54B, different alert pitch all map to

           SIGNAL_PITCH_UNKNOWN, expect get same result

         */
@@ -44,32 +44,33 @@ public class SignalToneUtilTest { 
                SignalToneUtil.IS95_CONST_IR_SIGNAL_TONE,

                SignalToneUtil.IS95_CONST_IR_ALERT_HIGH,

                SignalToneUtil.IS95_CONST_IR_SIG_TONE_DIAL);

        assertEquals(audioToneResult, ToneGenerator.TONE_CDMA_DIAL_TONE_LITE);

        assertEquals(ToneGenerator.TONE_CDMA_DIAL_TONE_LITE, audioToneResult);

        audioToneResult = SignalToneUtil.getAudioToneFromSignalInfo(

                SignalToneUtil.IS95_CONST_IR_SIGNAL_TONE,

                SignalToneUtil.TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,

                SignalToneUtil.IS95_CONST_IR_SIG_TONE_DIAL);

        assertEquals(audioToneResult, ToneGenerator.TONE_CDMA_DIAL_TONE_LITE);

        assertEquals(ToneGenerator.TONE_CDMA_DIAL_TONE_LITE, audioToneResult);

    }



    @SmallTest @Test

    @SmallTest

    @Test

    public void testSignalToneUtilInvalidInput() {

        int audioToneResult = SignalToneUtil.getAudioToneFromSignalInfo(

                SignalToneUtil.CDMA_INVALID_TONE,

                SignalToneUtil.IS95_CONST_IR_ALERT_HIGH,

                SignalToneUtil.IS95_CONST_IR_SIG_TONE_DIAL);

        assertEquals(audioToneResult, SignalToneUtil.CDMA_INVALID_TONE);

        assertEquals(SignalToneUtil.CDMA_INVALID_TONE, audioToneResult);



        audioToneResult = SignalToneUtil.getAudioToneFromSignalInfo(

                SignalToneUtil.IS95_CONST_IR_SIGNAL_TONE,

                SignalToneUtil.CDMA_INVALID_TONE,

                SignalToneUtil.IS95_CONST_IR_SIG_TONE_DIAL);

        assertEquals(audioToneResult, SignalToneUtil.CDMA_INVALID_TONE);

        assertEquals(SignalToneUtil.CDMA_INVALID_TONE, audioToneResult);



        audioToneResult = SignalToneUtil.getAudioToneFromSignalInfo(

                SignalToneUtil.IS95_CONST_IR_SIGNAL_TONE,

                SignalToneUtil.IS95_CONST_IR_ALERT_HIGH,

                SignalToneUtil.CDMA_INVALID_TONE);

        assertEquals(audioToneResult, SignalToneUtil.CDMA_INVALID_TONE);

        assertEquals(SignalToneUtil.CDMA_INVALID_TONE, audioToneResult);

    }

}