diff options
author | Yiqun Wu <yiqunw@google.com> | 2019-09-29 21:39:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-29 21:39:18 -0700 |
commit | a233077ddc191826a639d277c176b341cb718806 (patch) | |
tree | 3c621b0499c1985347690e8c62c92d210e773f72 | |
parent | 651d94ba6c8761eb7e4fda231a512baf0faeca1c (diff) | |
parent | a32e025005b75d2f2cd439b3d746e35754fe97d9 (diff) | |
download | Dialer-a233077ddc191826a639d277c176b341cb718806.tar.gz |
Fix the failing IncomingCallFragmentTest. am: ed94d6a42b am: 2d0bfa0cd4
am: a32e025005
Change-Id: I8e8b8f8e78f378b8e3a2cf7759d10f7d5dbfef4f
-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(); |