diff options
author | Yiqun Wu <yiqunw@google.com> | 2019-09-29 21:45:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-29 21:45:20 -0700 |
commit | ba20661e50c155a63de578f8eed70bddb3d490ca (patch) | |
tree | dfaf4cc7a39857e5cd2733ca6f6a44b8e1964776 | |
parent | 43b9c7bd20e958625d64ffab0c65469b37cfd436 (diff) | |
parent | a233077ddc191826a639d277c176b341cb718806 (diff) | |
download | Dialer-ba20661e50c155a63de578f8eed70bddb3d490ca.tar.gz |
Fix the failing IncomingCallFragmentTest. am: ed94d6a42b am: 2d0bfa0cd4 am: a32e025005
am: a233077ddc
Change-Id: I6d0b003d60f52bbaf694cc50568295865875bfbb
-rw-r--r-- | tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java index bc4ac60a..3d8b690b 100644 --- a/tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java +++ b/tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.when; import android.telecom.Call; import android.widget.TextView; -import androidx.lifecycle.MutableLiveData; - import com.android.car.dialer.CarDialerRobolectricTestRunner; import com.android.car.dialer.FragmentTestActivity; import com.android.car.dialer.R; -import com.android.car.dialer.testutils.ShadowAndroidViewModelFactory; +import com.android.car.dialer.TestDialerApplication; +import com.android.car.dialer.telecom.InCallServiceImpl; import org.junit.Before; import org.junit.Test; @@ -36,26 +35,26 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RuntimeEnvironment; + +import java.util.Collections; -@Config(shadows = {ShadowAndroidViewModelFactory.class}) @RunWith(CarDialerRobolectricTestRunner.class) public class IncomingCallFragmentTest { private IncomingCallFragment mIncomingCallFragment; @Mock private Call mMockCall; @Mock - private InCallViewModel mMockInCallViewModel; + InCallServiceImpl mMockInCallServiceImpl; @Before public void setUp() { MockitoAnnotations.initMocks(this); - ShadowAndroidViewModelFactory.add(InCallViewModel.class, mMockInCallViewModel); - - MutableLiveData<Call> callLiveData = new MutableLiveData<>(); - callLiveData.setValue(mMockCall); - when(mMockInCallViewModel.getIncomingCall()).thenReturn(callLiveData); + when(mMockCall.getState()).thenReturn(Call.STATE_RINGING); + when(mMockInCallServiceImpl.getCalls()).thenReturn(Collections.singletonList(mMockCall)); + ((TestDialerApplication) RuntimeEnvironment.application).setupInCallServiceImpl( + mMockInCallServiceImpl); FragmentTestActivity fragmentTestActivity = Robolectric.buildActivity( FragmentTestActivity.class).create().start().resume().get(); |