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

Commit 9c8fe7e7 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Update ApplicationListPreferenceCtrlTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I1b81bbdf63e9baf07f2db4eda71243c7cdab834e
parent 6a68f306
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -17,11 +17,15 @@
package com.android.settings.enterprise;

import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +33,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;

@@ -54,7 +59,7 @@ import java.util.List;
import java.util.Set;

@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class ApplicationListPreferenceControllerTest {

    private static final int MAIN_USER_ID = 0;
@@ -74,6 +79,8 @@ public class ApplicationListPreferenceControllerTest {
    private PackageManager mPackageManager;
    @Mock(answer = RETURNS_DEEP_STUBS)
    private SettingsPreferenceFragment mFragment;
    @Mock
    private UserManager mUserManager;

    private Context mContext;
    private ApplicationListPreferenceController mController;
@@ -82,7 +89,8 @@ public class ApplicationListPreferenceControllerTest {
    public void setUp() {
        MockitoAnnotations.initMocks(this);
        final ShadowApplication shadowContext = ShadowApplication.getInstance();
        mContext = shadowContext.getApplicationContext();
        mContext = spy(shadowContext.getApplicationContext());
        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
        when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);