From c44fca064be18753a852a1a8acc6b21395c2680f Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Wed, 14 Feb 2024 04:20:57 +0000 Subject: [PATCH] Fix StylusDevicesControllerTest after adding a stylus setting When the build allows for pointer icons to be shown for styluses, a third preference controller will be shown to toggle the pointer icon for styluses. Bug: 325014309 Test: atest StylusDevicesControllerTest Change-Id: I0b4d2a9b19492fb8e4c8c904116ca763ca77cb8e --- .../stylus/StylusDevicesControllerTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java index 135be4bc055..6c96f852ddc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java @@ -108,6 +108,9 @@ public class StylusDevicesControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(ApplicationProvider.getApplicationContext()); + final var spiedResources = spy(mContext.getResources()); + when(mContext.getResources()).thenReturn(spiedResources); + PreferenceManager preferenceManager = new PreferenceManager(mContext); mScreen = preferenceManager.createPreferenceScreen(mContext); mPreferenceContainer = new PreferenceCategory(mContext); @@ -144,6 +147,9 @@ public class StylusDevicesControllerTest { when(mInputDevice.hasKeys(KEYCODE_STYLUS_BUTTON_TAIL)).thenReturn( new boolean[]{true}); + when(spiedResources.getBoolean( + com.android.internal.R.bool.config_enableStylusPointerIcon)).thenReturn(true); + mController = new StylusDevicesController(mContext, mInputDevice, null, mLifecycle); } @@ -237,7 +243,7 @@ public class StylusDevicesControllerTest { Preference handwritingPref = mPreferenceContainer.getPreference(0); Preference buttonPref = mPreferenceContainer.getPreference(1); - assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(2); + assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(3); assertThat(handwritingPref.getTitle().toString()).isEqualTo( mContext.getString(R.string.stylus_textfield_handwriting)); assertThat(handwritingPref.isVisible()).isTrue();