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

Merge "Don't depend on shadow IRoleManager."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-11 01:54:12 +00:00
committed by Android (Google) Code Review
parent 7c7dde7768 1453ca6ebf
commit cda9876fe8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.app.role.RoleControllerManager; import android.app.role.RoleControllerManager;
import android.app.role.RoleManager;
import android.content.Context; import android.content.Context;
import org.junit.Before; import org.junit.Before;
@@ -36,6 +37,8 @@ public class DefaultSmsShortcutPreferenceControllerTest {
private static final String TEST_PACKAGE_NAME = "TestPackage"; private static final String TEST_PACKAGE_NAME = "TestPackage";
private static final String PREFERENCE_KEY = "default_sms_app"; private static final String PREFERENCE_KEY = "default_sms_app";
@Mock
private RoleManager mRoleManager;
@Mock @Mock
private RoleControllerManager mRoleControllerManager; private RoleControllerManager mRoleControllerManager;
@@ -44,8 +47,9 @@ public class DefaultSmsShortcutPreferenceControllerTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE, final ShadowApplication shadowApplication = ShadowApplication.getInstance();
mRoleControllerManager); shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager);
shadowApplication.setSystemService(Context.ROLE_CONTROLLER_SERVICE, mRoleControllerManager);
mController = new DefaultSmsShortcutPreferenceController(RuntimeEnvironment.application, mController = new DefaultSmsShortcutPreferenceController(RuntimeEnvironment.application,
TEST_PACKAGE_NAME); TEST_PACKAGE_NAME);
} }