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

Commit 7e80e3ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix test cases for Privacy package"

parents c37171f1 f9cdc3e9

tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.pm.UserInfo; 
import android.os.UserManager;

import android.permission.RuntimePermissionUsageInfo;

import android.provider.DeviceConfig;

import android.view.accessibility.AccessibilityManager;



import androidx.preference.PreferenceScreen;
@@ -55,6 +56,7 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.ShadowAccessibilityManager;

import org.robolectric.shadows.androidx.fragment.FragmentController;



import java.util.ArrayList;
@@ -80,6 +82,9 @@ public class PermissionBarChartPreferenceControllerTest { 
        final Context context = RuntimeEnvironment.application;

        final UserManager userManager = context.getSystemService(UserManager.class);

        final ShadowUserManager shadowUserManager = Shadow.extract(userManager);

        final ShadowAccessibilityManager accessibilityManager = Shadow.extract(

                AccessibilityManager.getInstance(context));

        accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());

        shadowUserManager.addProfile(new UserInfo(123, null, 0));

        when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(

                any(Context.class))).thenReturn(mLockPatternUtils);

tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Bundle; 
import android.os.UserManager;

import android.permission.PermissionControllerManager;

import android.view.View;

import android.view.accessibility.AccessibilityManager;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.testutils.FakeFeatureFactory;
@@ -44,8 +45,11 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.ShadowAccessibilityManager;

import org.robolectric.shadows.androidx.fragment.FragmentController;



import java.util.ArrayList;





@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class, ShadowPermissionControllerManager.class})
@@ -65,6 +69,9 @@ public class PrivacyDashboardFragmentTest { 
        mContext = RuntimeEnvironment.application;

        final UserManager userManager = mContext.getSystemService(UserManager.class);

        final ShadowUserManager shadowUserManager = Shadow.extract(userManager);

        final ShadowAccessibilityManager accessibilityManager = Shadow.extract(

                AccessibilityManager.getInstance(mContext));

        accessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());

        shadowUserManager.addProfile(new UserInfo(123, null, 0));

        when(FakeFeatureFactory.setupForTest().securityFeatureProvider.getLockPatternUtils(

                any(Context.class))).thenReturn(mLockPatternUtils);