Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InputMethodSystemServerTests: Make more robust

Browse Source 
Spying directly on the Context causes real invocations from the framework
to interfere with the stubbing.

Instead, we create our own spied-on copy of the Context.

Change-Id: I108d60389bc4d8a9c5a007cfb63e8a56093cae45
Test: atest InputMethodSystemServerTests
This commit is contained in:
Adrian Roos
2023-07-06 15:14:26 +00:00
parent 5bc990727d
commit 2c91bb46b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
View File

@@ -19,6 +19,7 @@ package com.android.server.inputmethod;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
import static org.mockito.ArgumentMatchers.any;
@@ -145,8 +146,7 @@ public class InputMethodManagerServiceTestBase {
.mockStatic(SystemServerInitThreadPool.class)
.startMocking();
mContext = InstrumentationRegistry.getInstrumentation().getContext();
spyOn(mContext);
mContext = spy(InstrumentationRegistry.getInstrumentation().getContext());
mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
mIsLargeScreen = mContext.getResources().getConfiguration()