commit ed94d6a42b12daff7f6696de315a312918478dd4
author Yiqun Wu <yiqunw@google.com> Fri Sep 27 17:25:36 2019 -0700
committer Yiqun Wu <yiqunw@google.com> Fri Sep 27 17:30:25 2019 -0700
tree fd455f3102d3d64acccf44e1c3f249f7921edaa3
parent 630b40de01d76e407afb681f3089a789758c04e4

Fix the failing IncomingCallFragmentTest.

Test: mma
Fixes: 141759990
Change-Id: I0d9ed59cbc0496ccdeb46d4fdf2ea32dfe23225e

tests/robotests/src/com/android/car/dialer/ui/activecall/IncomingCallFragmentTest.java

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 bc4ac60..3d8b690 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 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.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
 
-@Config(shadows = {ShadowAndroidViewModelFactory.class})
+import java.util.Collections;
+
 @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();