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

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/users/UserSettingsTest.java
View File

@@ -27,7 +27,6 @@ import android.content.pm.UserInfo;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,14 +36,14 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserSettingsTest {
@Mock private UserManager mUserManager;
@Mock private SummaryLoader mSummaryLoader;
@Mock
private UserManager mUserManager;
@Mock
private SummaryLoader mSummaryLoader;
private Activity mActivity;
private SummaryLoader.SummaryProvider mSummaryProvider;
@@ -54,8 +53,8 @@ public class UserSettingsTest {
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
when((Object) mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager);
mSummaryProvider = UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
mActivity, mSummaryLoader);
mSummaryProvider =
UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
}
@Test
@@ -67,8 +66,8 @@ public class UserSettingsTest {
mSummaryProvider.setListening(true);
verify(mSummaryLoader).setSummary(mSummaryProvider,
mActivity.getString(R.string.users_summary, name));
verify(mSummaryLoader)
.setSummary(mSummaryProvider, mActivity.getString(R.string.users_summary, name));
}
@Test