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

Commit 1eb5c3ee authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge changes I8668be19,Ifb7769a1 

* changes:
  move defaultapps package to sdk 26
  Update DefaultAppInfoTest to sdk 26
parents 6cfc72de cde01ce7

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java

+18 −3
Original line number Diff line number Diff line
@@ -17,11 +17,17 @@ 
package com.android.settings.applications.defaultapps;



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



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;
@@ -39,7 +45,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DefaultAppInfoTest {



    @Mock
@@ -50,15 +56,24 @@ public class DefaultAppInfoTest { 
    private PackageManager mPackageManager;

    @Mock

    private PackageManagerWrapper mPackageManagerWrapper;

    @Mock

    private ApplicationInfo mApplicationInfo;

    @Mock

    private Drawable mIcon;



    private Context mContext;

    private DefaultAppInfo mInfo;



    @Before

    public void setUp() {

    public void setUp() throws PackageManager.NameNotFoundException {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mContext = spy(RuntimeEnvironment.application);

        doReturn(mPackageManager).when(mContext).getPackageManager();

        when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);

        when(mPackageManagerWrapper.getApplicationInfoAsUser(anyString(), anyInt(),

                anyInt())).thenReturn(mApplicationInfo);

        when(mPackageManager.loadUnbadgedItemIcon(mPackageItemInfo, mApplicationInfo)).thenReturn(

                mIcon);

    }



    @Test

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DefaultAppPickerFragmentTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DefaultAppPreferenceControllerTest {



    private static final String TEST_APP_NAME = "test";

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DefaultAutofillPickerTest {



    private static final String TEST_APP_KEY = "foo.bar/foo.bar.Baz";

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class DefaultAutofillPreferenceControllerTest {



    @Mock