From 755062ae7ffff73482bbc49b942c1b135abfb17c Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 28 Sep 2017 13:24:16 -0700 Subject: [PATCH] Fix a failing test in AdbPreferenceControllerTest - Mock out a problematic method Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ib12f1e852d27df705f5a13e73f29b0b6f4ab5ff6 --- .../settings/development/AdbPreferenceControllerTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index 2404f677d0b..25353abeb2f 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -18,6 +18,8 @@ package com.android.settings.development; 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.when; @@ -60,7 +62,8 @@ public class AdbPreferenceControllerTest { public void setup() { MockitoAnnotations.initMocks(this); 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.getContentResolver()).thenReturn(mContentResolver); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(