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

Commit e6bb72ed authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Fix testVoiceMailNumberCdma." am: 6e733756 

am: 94601fa6

Change-Id: I8f2854e0cb78ab749b8ddbb9ee7c74c630685dc3
parents d69422a5 94601fa6

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

+5 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.anyInt; 
import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;
@@ -77,6 +78,7 @@ import org.junit.Ignore; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.InOrder;

import org.mockito.Mock;

import org.mockito.Mockito;
@@ -583,7 +585,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        voiceMailNumber = "1234567893";

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

        InOrder inOrder = inOrder(mSimRecords);

        inOrder.verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

                messageArgumentCaptor.capture());



        // SIM does not support voicemail number (IccVmNotSupportedException) so should be saved in
@@ -600,7 +603,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        voiceMailNumber = "1234567894";

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);

        messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

        inOrder.verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

                messageArgumentCaptor.capture());



        // successfully saved on SIM