PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the constant actionId directly when calling

Browse Source 
performAccessibilityAction

**Root cause**
When constructing an AccessibilityAction, robolectric's
ShadowAccessibilityAction uses reflection to get the private static
final variable `ACTION_TYPE_MASK` to check if the passed action is a
valid action.

However, since ag/I744b3a94fe3c3cc3b559758a95ab0b5b181155bb we renamed
the internal variable, hence robolectric is not able to find the
ACTION_TYPE_MASK variable when using reflection.

By passing the action id directly when calling
performAccessibilityAction, we don't need to use
ShadowAccessibilityAction anymore.

Bug: 279082331
Test: atest AccessibilityQuickSettingsTooltipWindowTest

Change-Id: Ie956de44c9b19a2d19470ad670866d77ca272b3b
This commit is contained in:
Chun-Ku Lin
2023-06-02 23:16:48 +00:00
parent aeb630b1f5
commit de5809a4f6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java
View File

@@ -19,7 +19,9 @@ package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.robolectric.Shadows.shadowOf;
import android.app.Application;
import android.content.Context; import android.content.Context;
import android.view.View; import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
@@ -37,8 +39,6 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule; import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLooper; import org.robolectric.shadows.ShadowLooper;
@@ -61,7 +61,7 @@ public class AccessibilityQuickSettingsTooltipWindowTest {
@Before @Before
public void setUp() { public void setUp() {
mTooltipView = new AccessibilityQuickSettingsTooltipWindow(mContext); mTooltipView = new AccessibilityQuickSettingsTooltipWindow(mContext);
mView = new View(RuntimeEnvironment.application); mView = new View(mContext);
} }
@Test @Test
@@ -92,7 +92,7 @@ public class AccessibilityQuickSettingsTooltipWindowTest {
final boolean isActionPerformed = final boolean isActionPerformed =
mTooltipView.getContentView().performAccessibilityAction( mTooltipView.getContentView().performAccessibilityAction(
AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK.getId(), AccessibilityNodeInfo.ACTION_CLICK,
/* arguments= */ null); /* arguments= */ null);
assertThat(isActionPerformed).isTrue(); assertThat(isActionPerformed).isTrue();
@@ -125,7 +125,8 @@ public class AccessibilityQuickSettingsTooltipWindowTest {
} }
private static PopupWindow getLatestPopupWindow() { private static PopupWindow getLatestPopupWindow() {
final ShadowApplication shadowApplication = Shadow.extract(RuntimeEnvironment.application); final ShadowApplication shadowApplication = shadowOf(
(Application) ApplicationProvider.getApplicationContext());
return shadowApplication.getLatestPopupWindow(); return shadowApplication.getLatestPopupWindow();
} }
} }