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

Commit 5606a8c7 authored by Mill Chen's avatar Mill Chen
Browse files

Enabling sharding RunSettingsRoboTests 

Also fixed failed test cases caused by running
RunSettingsRoboTests with the sharding mechanism.

Bug: 130895860
Test: make RunSettingsRoboTests -j40
Change-Id: I0e5e0764d4ea910b9c0acc693d63a4b793e23d3a
parent 62aa8614

tests/robotests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ android_robolectric_test { 


    test_options: {

        timeout: 36000,

        shards: 10,

    },



    coverage_libs: [

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

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ import com.android.settingslib.widget.RadioButtonPreference; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;
@@ -49,20 +49,20 @@ import java.util.List; 
@RunWith(RobolectricTestRunner.class)

public class DefaultAppPickerFragmentTest {



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private FragmentActivity mActivity;

    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private UserManager mUserManager;



    private FakeFeatureFactory mFeatureFactory;

    private FragmentActivity mActivity;

    private TestFragment mFragment;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());

        mFragment = spy(new TestFragment());



        when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);