Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c91bb46 authored by Adrian Roos's avatar Adrian Roos
Browse files

InputMethodSystemServerTests: Make more robust 

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
parent 5bc99072

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

+2 −2
Original line number Diff line number Diff line
@@ -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()