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

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

Merge changes Icae52730,I38282b97 

* changes:
  Move dashboard test package to sdk 26
  Update DashboardFeatureProviderImplTest to sdk 26
parents 15b2e793 e4a2f95c

tests/robotests/res/values-mcc999/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->



<resources>

    <bool name="config_tintSettingIcon">false</bool>

    <bool name="config_enableColorTemperature">false</bool>

    <bool name="config_show_camera_laser_sensor">false</bool>

    <bool name="config_show_connectivity_monitor">false</bool>

tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java

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


@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResources.SettingsShadowTheme.class,

tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java

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



@RunWith(RobolectricTestRunner.class)

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

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

public class DashboardDataTest {

    private static final String TEST_SUGGESTION_TITLE = "Use fingerprint";

    private static final String TEST_CATEGORY_TILE_TITLE = "Display";

tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java

+24 −13
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 
package com.android.settings.dashboard;



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



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.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.robolectric.RuntimeEnvironment.application;
@@ -30,7 +33,8 @@ import android.app.Activity; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.Bitmap;

import android.graphics.drawable.Icon;

import android.os.Bundle;
@@ -60,6 +64,7 @@ import org.mockito.Answers; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowActivity;

import org.robolectric.shadows.ShadowApplication;
@@ -69,7 +74,7 @@ import java.util.ArrayList; 


@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = ShadowUserManager.class)

public class DashboardFeatureProviderImplTest {
@@ -79,21 +84,28 @@ public class DashboardFeatureProviderImplTest { 
    private UserManager mUserManager;

    @Mock

    private CategoryManager mCategoryManager;

    @Mock

    private PackageManager mPackageManager;

    private FakeFeatureFactory mFeatureFactory;



    private Context mContext;

    private DashboardFeatureProviderImpl mImpl;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(RuntimeEnvironment.application);

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

        when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(

                new ResolveInfo());

        FakeFeatureFactory.setupForTest(mActivity);

        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);

        mImpl = new DashboardFeatureProviderImpl(mActivity);

        mImpl = new DashboardFeatureProviderImpl(mContext);

    }



    @Test

    public void shouldHoldAppContext() {

        assertThat(mImpl.mContext).isEqualTo(mActivity.getApplicationContext());

        assertThat(mImpl.mContext).isEqualTo(mContext.getApplicationContext());

    }



    @Test
@@ -342,7 +354,7 @@ public class DashboardFeatureProviderImplTest { 
    }



    @Test

    public void bindPreference_withIntentActionMetatdata_shouldSetLaunchAction() {

    public void bindPreference_withIntentActionMetadata_shouldSetLaunchAction() {

        Activity activity = Robolectric.buildActivity(Activity.class).get();

        final ShadowApplication application = ShadowApplication.getInstance();

        final Preference preference = new Preference(application.getApplicationContext());
@@ -437,14 +449,13 @@ public class DashboardFeatureProviderImplTest { 
    }



    @Test

    public void testShouldTintIcon_shouldReturnValueFromResource() {

        final Resources res = mActivity.getApplicationContext().getResources();

        when(res.getBoolean(R.bool.config_tintSettingIcon))

                .thenReturn(false);

        assertThat(mImpl.shouldTintIcon()).isFalse();



        when(res.getBoolean(R.bool.config_tintSettingIcon))

                .thenReturn(true);

    public void testShouldTintIcon_enabledInResources_shouldBeTrue() {

        assertThat(mImpl.shouldTintIcon()).isTrue();

    }



    @Test

    @Config(qualifiers = "mcc999")

    public void testShouldTintIcon_disabledInResources_shouldBeFalse() {

        assertThat(mImpl.shouldTintIcon()).isFalse();

    }

}

tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,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 DashboardFragmentTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)