From a5936ba2666dee9585b725d11ca86d514c58422f Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Fri, 6 Mar 2020 12:47:59 +0800
Subject: [PATCH] Fix Robotests failure on accessibility ShortcutPreference

Bug: 150906744
Bug: 150910193
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I2feaad60eae3688f6452c29242affc55a80411a0
---
 .../accessibility/ShortcutPreferenceTest.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
index 597e94e0d8d..714ef9a1129 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutPreferenceTest.java
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.LinearLayout;
 
 import androidx.preference.PreferenceViewHolder;
 
@@ -37,7 +36,7 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class ShortcutPreferenceTest {
 
-    private static final String CHECKBOX_CLICKED = "checkbox_clicked";
+    private static final String TOGGLE_CLICKED = "toggle_clicked";
     private static final String SETTINGS_CLICKED = "settings_clicked";
 
     private ShortcutPreference mShortcutPreference;
@@ -48,7 +47,7 @@ public class ShortcutPreferenceTest {
             new ShortcutPreference.OnClickCallback() {
                 @Override
                 public void onToggleClicked(ShortcutPreference preference) {
-                    mResult = CHECKBOX_CLICKED;
+                    mResult = TOGGLE_CLICKED;
                 }
 
                 @Override
@@ -69,14 +68,13 @@ public class ShortcutPreferenceTest {
     }
 
     @Test
-    public void clickLinearLayout_checkboxClicked() {
+    public void clickToggle_toggleClicked() {
         mShortcutPreference.onBindViewHolder(mPreferenceViewHolder);
         mShortcutPreference.setOnClickCallback(mListener);
 
-        LinearLayout mainFrame = mPreferenceViewHolder.itemView.findViewById(R.id.main_frame);
-        mainFrame.performClick();
+        mPreferenceViewHolder.itemView.performClick();
 
-        assertThat(mResult).isEqualTo(CHECKBOX_CLICKED);
+        assertThat(mResult).isEqualTo(TOGGLE_CLICKED);
         assertThat(mShortcutPreference.isChecked()).isTrue();
     }
 
@@ -85,14 +83,14 @@ public class ShortcutPreferenceTest {
         mShortcutPreference.onBindViewHolder(mPreferenceViewHolder);
         mShortcutPreference.setOnClickCallback(mListener);
 
-        View settings = mPreferenceViewHolder.itemView.findViewById(android.R.id.widget_frame);
+        final View settings = mPreferenceViewHolder.itemView.findViewById(R.id.main_frame);
         settings.performClick();
 
         assertThat(mResult).isEqualTo(SETTINGS_CLICKED);
     }
 
     @Test
-    public void setCheckedTrue_getCheckedIsTrue() {
+    public void setCheckedTrue_getToggleIsTrue() {
         mShortcutPreference.setChecked(true);
 
         assertThat(mShortcutPreference.isChecked()).isEqualTo(true);