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

Commit 292f4070 authored by Edgar Wang's avatar Edgar Wang
Browse files

Fix robo test case failed 

Bug: 300134365
Test: robotest
Change-Id: I144fbbc962a479c97312cee1645c5a3d70351542
parent 5872a8f5

tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.Bundle;



import androidx.fragment.app.FragmentActivity;
@@ -38,6 +39,7 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;
@@ -53,7 +55,7 @@ public class InstrumentedPreferenceFragmentTest { 
    private PreferenceManager mPreferenceManager;

    @Mock

    private FragmentActivity mActivity;



    private Context mContext;

    private InstrumentedPreferenceFragmentTestable mFragment;



    @Before
@@ -61,7 +63,9 @@ public class InstrumentedPreferenceFragmentTest { 
        MockitoAnnotations.initMocks(this);

        when(mPreferenceManager.getPreferenceScreen()).thenReturn(mScreen);



        mContext = RuntimeEnvironment.application;

        mFragment = spy(new InstrumentedPreferenceFragmentTestable());

        when(mFragment.getContext()).thenReturn(mContext);

        ReflectionHelpers.setField(mFragment, "mPreferenceManager", mPreferenceManager);

    }

tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import org.robolectric.RuntimeEnvironment; 
@RunWith(RobolectricTestRunner.class)

public class TimePreferenceControllerTest {



    @Mock

    private Context mContext;

    @Mock

    private TimePreferenceController.TimePreferenceHost mHost;
@@ -49,6 +48,7 @@ public class TimePreferenceControllerTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mPreference = new RestrictedPreference(RuntimeEnvironment.application);

        mController = new TimePreferenceController(mContext, mHost, mDatePreferenceController);

    }

tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import androidx.fragment.app.Fragment; 
import androidx.preference.Preference;

import androidx.test.core.app.ApplicationProvider;



import com.android.settingslib.development.DevelopmentSettingsEnabler;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -52,6 +54,7 @@ public class RebootWithMtePreferenceControllerTest { 
        mContext = ApplicationProvider.getApplicationContext();

        mController = new RebootWithMtePreferenceController(mContext);

        mController.setFragment(mFragment);

        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, true);

    }



    @Test

tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.settings.testutils.FakeFeatureFactory; 
import com.android.settings.testutils.ResolveInfoBuilder;

import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager;

import com.android.settings.testutils.shadow.ShadowSystemSettings;



import org.junit.Before;

import org.junit.Test;
@@ -55,6 +56,7 @@ import org.robolectric.annotation.Config; 


@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        ShadowSystemSettings.class,

        ShadowSensorPrivacyManager.class,

        ShadowDeviceStateRotationLockSettingsManager.class

})

tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class ContextualCardLoaderTest { 
    @Test

    public void getCardCount_hasConfiguredCardCount_returnConfiguredCardCount() {

        int configCount = 4;

        Settings.Global.putLong(mContext.getContentResolver(),

        Settings.Global.putInt(mContext.getContentResolver(),

                ContextualCardLoader.CONTEXTUAL_CARD_COUNT, configCount);



        assertThat(mContextualCardLoader.getCardCount()).isEqualTo(configCount);