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

Commit dd940a31 authored by Angela Wang's avatar Angela Wang Committed by Automerger Merge Worker
Browse files

Merge "Fixes fail test cases in AccessibilitySettingsTest" into udc-dev am: 5f87e3bb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21504366



Change-Id: Iccd1547092dcae617db737207f7b003595cab4d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d5dde35 5f87e3bb

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

+6 −0
Original line number Diff line number Diff line
@@ -56,9 +56,11 @@ import com.android.internal.accessibility.util.AccessibilityUtils; 
import com.android.internal.content.PackageMonitor;

import com.android.settings.R;

import com.android.settings.testutils.XmlTestUtils;

import com.android.settings.testutils.shadow.ShadowBluetoothUtils;

import com.android.settings.testutils.shadow.ShadowFragment;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.search.SearchIndexableRaw;
@@ -85,6 +87,7 @@ import java.util.List; 


/** Test for {@link AccessibilitySettings}. */

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothUtils.class})

public class AccessibilitySettingsTest {

    private static final String PACKAGE_NAME = "com.android.test";

    private static final String CLASS_NAME = PACKAGE_NAME + ".test_a11y_service";
@@ -116,6 +119,8 @@ public class AccessibilitySettingsTest { 
    private ShadowAccessibilityManager mShadowAccessibilityManager;

    @Mock

    private AppOpsManager mAppOpsManager;

    @Mock

    private LocalBluetoothManager mLocalBluetoothManager;



    private Lifecycle mLifecycle;
@@ -134,6 +139,7 @@ public class AccessibilitySettingsTest { 
                anyInt(), anyString())).thenReturn(AppOpsManager.MODE_ALLOWED);

        mLifecycle = new Lifecycle(() -> mLifecycle);

        when(mFragment.getSettingsLifecycle()).thenReturn(mLifecycle);

        ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;

    }



    @Test