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

Commit 0d297ab7 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge changes from topic "a11y-menu-test-fix" into main 

* changes:
  Skips the voice assistant test on devices which don't support it.
  Fix for A11yMenu test mapping to include postsubmit
parents e2897b10 d1738b11

packages/SystemUI/accessibility/accessibilitymenu/TEST_MAPPING

+9 −2
Original line number Original line Diff line number Diff line
@@ -4,8 +4,15 @@ 
      "name": "AccessibilityMenuServiceTests",

      "name": "AccessibilityMenuServiceTests",

      "options": [

      "options": [

        {

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

          "exclude-annotation": "android.support.test.filters.FlakyTest"

        },

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "AccessibilityMenuServiceTests",

      "options": [

        {

        {

          "exclude-annotation": "android.support.test.filters.FlakyTest"

          "exclude-annotation": "android.support.test.filters.FlakyTest"

        }

        }

packages/SystemUI/accessibility/accessibilitymenu/tests/src/com/android/systemui/accessibility/accessibilitymenu/tests/AccessibilityMenuServiceTest.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import android.app.Instrumentation; 
import android.app.KeyguardManager;

import android.app.KeyguardManager;

import android.app.UiAutomation;

import android.app.UiAutomation;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;
@@ -57,6 +58,7 @@ import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortc 




import org.junit.After;

import org.junit.After;

import org.junit.AfterClass;

import org.junit.AfterClass;

import org.junit.Assume;

import org.junit.Before;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.Test;
@@ -330,8 +332,10 @@ public class AccessibilityMenuServiceTest { 
        AccessibilityNodeInfo assistantButton = findGridButtonInfo(getGridButtonList(),

        AccessibilityNodeInfo assistantButton = findGridButtonInfo(getGridButtonList(),

                String.valueOf(ShortcutId.ID_ASSISTANT_VALUE.ordinal()));

                String.valueOf(ShortcutId.ID_ASSISTANT_VALUE.ordinal()));

        Intent expectedIntent = new Intent(Intent.ACTION_VOICE_COMMAND);

        Intent expectedIntent = new Intent(Intent.ACTION_VOICE_COMMAND);

        String expectedPackage = expectedIntent.resolveActivity(

        ComponentName componentName = expectedIntent.resolveActivity(

                sInstrumentation.getContext().getPackageManager()).getPackageName();

                sInstrumentation.getContext().getPackageManager());

        Assume.assumeNotNull(componentName);

        String expectedPackage = componentName.getPackageName();





        sUiAutomation.executeAndWaitForEvent(

        sUiAutomation.executeAndWaitForEvent(

                () -> assistantButton.performAction(CLICK_ID),

                () -> assistantButton.performAction(CLICK_ID),