PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enabling sharding RunSettingsRoboTests

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

Bug: 130895860
Test: make RunSettingsRoboTests -j40
Change-Id: I0e5e0764d4ea910b9c0acc693d63a4b793e23d3a
This commit is contained in:
Mill Chen
2019-08-07 16:34:17 +08:00
parent 62aa86145c
commit 5606a8c7f5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/Android.bp
View File

@@ -67,6 +67,7 @@ android_robolectric_test {
test_options: { test_options: {
timeout: 36000, timeout: 36000,
shards: 10,
}, },
coverage_libs: [ coverage_libs: [

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

@@ -37,9 +37,9 @@ import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@@ -49,20 +49,20 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class DefaultAppPickerFragmentTest { public class DefaultAppPickerFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private FragmentActivity mActivity;
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
@Mock @Mock
private UserManager mUserManager; private UserManager mUserManager;
private FakeFeatureFactory mFeatureFactory; private FakeFeatureFactory mFeatureFactory;
private FragmentActivity mActivity;
private TestFragment mFragment; private TestFragment mFragment;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest(); mFeatureFactory = FakeFeatureFactory.setupForTest();
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
mFragment = spy(new TestFragment()); mFragment = spy(new TestFragment());
when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);