commit 6402cb25bbc009468826f616436a685cafb99241
author mincheli <mincheli@google.com> Mon Jan 03 19:58:22 2022 +0800
committer Ryan Lin <ryanlwlin@google.com> Wed Jan 05 02:26:00 2022 +0000
tree 5c7d483667e1c62ae0158f90f49aa3883bc67244
parent 4f92263ac4c60d9d9e4afbad106411ab8c69992b

Corrects the classNameAndTextList of buttons in AccessibilityWindowQueryTest

It fixes the CTS failures.

Bug: 210196977
Bug: 210199968
Test: atest AccessibilityWindowQueryTest
Change-Id: I393b28fe4c0bed0ec2fb8d565f4778c2ea8bc6df
(cherry picked from commit ee1ac57beecded8e3a3943c5d75aaf4b24d1d490)

tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index ecdab0f..eb9f037 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -912,15 +912,16 @@
             classNameAndTextList.add("android.widget.LinearLayout");
             classNameAndTextList.add("android.widget.LinearLayout");
             classNameAndTextList.add("android.widget.LinearLayout");
-            classNameAndTextList.add("android.widget.ButtonB1");
-            classNameAndTextList.add("android.widget.ButtonB2");
-            classNameAndTextList.add("android.widget.ButtonB3");
-            classNameAndTextList.add("android.widget.ButtonB4");
-            classNameAndTextList.add("android.widget.ButtonB5");
-            classNameAndTextList.add("android.widget.ButtonB6");
-            classNameAndTextList.add("android.widget.ButtonB7");
-            classNameAndTextList.add("android.widget.ButtonB8");
-            classNameAndTextList.add("android.widget.ButtonB9");
+            final String btnClass = "android.widget.Button";
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button1)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button2)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button3)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button4)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button5)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button6)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button7)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button8)));
+            classNameAndTextList.add(btnClass.concat(mActivity.getString(R.string.button9)));
 
             boolean verifyContent = false;