PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a failing test in AdbPreferenceControllerTest

Browse Source 
- Mock out a problematic method

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib12f1e852d27df705f5a13e73f29b0b6f4ab5ff6
This commit is contained in:
jeffreyhuang
2017-09-28 13:24:16 -07:00
parent f77a3fbdc3
commit 755062ae7f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -60,7 +62,8 @@ public class AdbPreferenceControllerTest {
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContentResolver = RuntimeEnvironment.application.getContentResolver(); mContentResolver = RuntimeEnvironment.application.getContentResolver();
mController = new AdbPreferenceController(mContext, mFragment); mController = spy(new AdbPreferenceController(mContext, mFragment));
doNothing().when(mController).notifyStateChanged();
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(mContext.getContentResolver()).thenReturn(mContentResolver); when(mContext.getContentResolver()).thenReturn(mContentResolver);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(