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

Merge "Fix StylusDevicesControllerTest after adding a stylus setting" into main

Browse Source
This commit is contained in:
Prabir Pradhan
2024-02-14 15:00:09 +00:00
committed by Android (Google) Code Review
parent dd57b93266 c44fca064b
commit c6f30c3eab
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
View File

@@ -108,6 +108,9 @@ public class StylusDevicesControllerTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext()); mContext = spy(ApplicationProvider.getApplicationContext());
final var spiedResources = spy(mContext.getResources());
when(mContext.getResources()).thenReturn(spiedResources);
PreferenceManager preferenceManager = new PreferenceManager(mContext); PreferenceManager preferenceManager = new PreferenceManager(mContext);
mScreen = preferenceManager.createPreferenceScreen(mContext); mScreen = preferenceManager.createPreferenceScreen(mContext);
mPreferenceContainer = new PreferenceCategory(mContext); mPreferenceContainer = new PreferenceCategory(mContext);
@@ -144,6 +147,9 @@ public class StylusDevicesControllerTest {
when(mInputDevice.hasKeys(KEYCODE_STYLUS_BUTTON_TAIL)).thenReturn( when(mInputDevice.hasKeys(KEYCODE_STYLUS_BUTTON_TAIL)).thenReturn(
new boolean[]{true}); new boolean[]{true});
when(spiedResources.getBoolean(
com.android.internal.R.bool.config_enableStylusPointerIcon)).thenReturn(true);
mController = new StylusDevicesController(mContext, mInputDevice, null, mLifecycle); mController = new StylusDevicesController(mContext, mInputDevice, null, mLifecycle);
} }
@@ -237,7 +243,7 @@ public class StylusDevicesControllerTest {
Preference handwritingPref = mPreferenceContainer.getPreference(0); Preference handwritingPref = mPreferenceContainer.getPreference(0);
Preference buttonPref = mPreferenceContainer.getPreference(1); Preference buttonPref = mPreferenceContainer.getPreference(1);
assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(2); assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(3);
assertThat(handwritingPref.getTitle().toString()).isEqualTo( assertThat(handwritingPref.getTitle().toString()).isEqualTo(
mContext.getString(R.string.stylus_textfield_handwriting)); mContext.getString(R.string.stylus_textfield_handwriting));
assertThat(handwritingPref.isVisible()).isTrue(); assertThat(handwritingPref.isVisible()).isTrue();