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

Make Settings robotest work with tot Robolectric

Browse Source 
Bug: 116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
This commit is contained in:
Fan Zhang
2018-10-11 15:37:36 -07:00
parent dd3feeb155
commit cdf284b732
140 changed files with 706 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings;
import static com.android.settings.testutils.ResIdSubject.assertResId;
import static com.google.common.truth.Truth.assertThat;
import android.content.Intent;
@@ -33,7 +31,7 @@ import org.junit.runner.RunWith;
public class SetupWizardUtilsTest {
@Test
public void testCopySetupExtras() throws Throwable {
public void testCopySetupExtras() {
Intent fromIntent = new Intent();
final String theme = "TEST_THEME";
fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
@@ -53,7 +51,7 @@ public class SetupWizardUtilsTest {
Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
}
@Test
@@ -62,7 +60,7 @@ public class SetupWizardUtilsTest {
WizardManagerHelper.THEME_GLIF_V2_LIGHT);
Intent intent = new Intent();
assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
}
@Test
@@ -71,8 +69,8 @@ public class SetupWizardUtilsTest {
WizardManagerHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent();
assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
assertResId(SetupWizardUtils.getTransparentTheme(intent))
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
assertThat(SetupWizardUtils.getTransparentTheme(intent))
.isEqualTo(R.style.GlifV3Theme_Light_Transparent);
}
}