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

Commit 349582e8 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Fix: Test breakage due to A11y shortcuts flag rampup 

Test breakage: b/410893697
Bug: 410893697
Test: atest FrameworkServicesTests_accessibility
Flag: EXEMPT test_only

Change-Id: Id7503d72dd623890d3669f59472c662e65edfcc8
parent e8638894

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityInputFilterInputTest.kt

+18 −1
Original line number Diff line number Diff line
@@ -15,7 +15,12 @@ 
 */

package com.android.server.accessibility



import android.content.Context

import android.content.ContextWrapper

import android.hardware.display.DisplayManagerGlobal

import android.hardware.input.IInputManager

import android.hardware.input.InputManager

import android.hardware.input.InputManagerGlobal

import android.os.SystemClock

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.CheckFlagsRule
@@ -129,12 +134,17 @@ class AccessibilityInputFilterInputTest { 
    @Mock

    private lateinit var mockMagnificationProcessor: MagnificationProcessor



    @Mock

    private lateinit var inputManager: IInputManager

    private lateinit var inputManagerGlobalSession: InputManagerGlobal.TestSession



    private val inputEvents = LinkedBlockingQueue<InputEvent>()

    private val verifier = BlockingQueueEventVerifier(inputEvents)



    @Mock

    private lateinit var host: IInputFilterHost

    private lateinit var ams: AccessibilityManagerService

    private lateinit var context: Context

    private lateinit var a11yInputFilter: AccessibilityInputFilter

    private val touchDeviceId = 1

    private val fromTouchScreen = allOf(withDeviceId(touchDeviceId), withSource(SOURCE_TOUCHSCREEN))
@@ -155,9 +165,13 @@ class AccessibilityInputFilterInputTest { 


    @Before

    fun setUp() {

        val context = instrumentation.context

        context = Mockito.spy(ContextWrapper(instrumentation.context))

        LocalServices.removeServiceForTest(WindowManagerInternal::class.java)

        LocalServices.addService(WindowManagerInternal::class.java, mockWindowManagerService)

        inputManagerGlobalSession = InputManagerGlobal.createTestSession(inputManager)

        val inputManager = InputManager(context)

        whenever(context.getSystemService(Mockito.eq(Context.INPUT_SERVICE)))

            .thenReturn(inputManager)



        whenever(mockA11yController.isAccessibilityTracingEnabled).thenReturn(false)

        whenever(
@@ -185,6 +199,9 @@ class AccessibilityInputFilterInputTest { 
        if (this::a11yInputFilter.isInitialized) {

            a11yInputFilter.uninstall()

        }

        if (this::inputManagerGlobalSession.isInitialized) {

            inputManagerGlobalSession.close()

        }

    }



    /**

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityInputFilterTest.java

+13 −1
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ import static org.mockito.Mockito.when; 


import android.annotation.Nullable;

import android.content.Context;

import android.content.ContextWrapper;

import android.hardware.display.DisplayManagerGlobal;

import android.hardware.input.IInputManager;

import android.hardware.input.InputManager;

import android.hardware.input.InputManagerGlobal;

import android.os.Looper;

import android.os.SystemClock;

import android.platform.test.annotations.RequiresFlagsDisabled;
@@ -72,6 +76,7 @@ import org.junit.Rule; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;



import java.util.ArrayList;
@@ -113,6 +118,9 @@ public class AccessibilityInputFilterTest { 
    @Mock private WindowManagerInternal.AccessibilityControllerInternal mMockA11yController;

    @Mock private WindowManagerInternal mMockWindowManagerService;

    @Mock private MagnificationProcessor mMockMagnificationProcessor;

    @Mock

    private IInputManager mMockInputManager;

    private InputManagerGlobal.TestSession mInputManagerGlobalSession;

    private AccessibilityManagerService mAms;

    private AccessibilityInputFilter mA11yInputFilter;

    private EventCaptor mCaptor1;
@@ -154,13 +162,16 @@ public class AccessibilityInputFilterTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        Context context = InstrumentationRegistry.getContext();

        Context context = Mockito.spy(new ContextWrapper(InstrumentationRegistry.getContext()));

        LocalServices.removeServiceForTest(WindowManagerInternal.class);

        LocalServices.addService(

                WindowManagerInternal.class, mMockWindowManagerService);

        when(mMockWindowManagerService.getAccessibilityController()).thenReturn(

                mMockA11yController);

        when(mMockA11yController.isAccessibilityTracingEnabled()).thenReturn(false);

        mInputManagerGlobalSession = InputManagerGlobal.createTestSession(mMockInputManager);

        InputManager inputManager = new InputManager(context);

        when(context.getSystemService(Mockito.eq(Context.INPUT_SERVICE))).thenReturn(inputManager);



        setDisplayCount(1);

        mAms = spy(new AccessibilityManagerService(context));
@@ -174,6 +185,7 @@ public class AccessibilityInputFilterTest { 
    @After

    public void tearDown() {

        mA11yInputFilter.onUninstalled();

        mInputManagerGlobalSession.close();

    }



    @Test