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

Adopt robolectric 3.5.1

Browse Source 
Bug: 70581603
Test: make RunSettingsRoboTests
Change-Id: I21dba3381ae62ee12de1ce29bea473b3d0f069c0
This commit is contained in:
James Lemieux
2017-12-12 17:31:47 -08:00
parent 84e8c795b1
commit 9453999e6f
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/Android.mk
View File

@@ -14,7 +14,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
junit \ junit \
platform-robolectric-3.4.2-prebuilt \ platform-robolectric-3.5.1-prebuilt \
telephony-common telephony-common
LOCAL_INSTRUMENTATION_FOR := Settings LOCAL_INSTRUMENTATION_FOR := Settings
@@ -42,4 +42,4 @@ LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
LOCAL_ROBOTEST_TIMEOUT := 36000 LOCAL_ROBOTEST_TIMEOUT := 36000
include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk

6
tests/robotests/src/com/android/settings/HelpTrampolineTest.java
View File

@@ -50,7 +50,7 @@ public class HelpTrampolineTest {
final Intent intent = new Intent().setClassName( final Intent intent = new Intent().setClassName(
RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName()); RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName());
Robolectric.buildActivity(HelpTrampoline.class).withIntent(intent).create().get(); Robolectric.buildActivity(HelpTrampoline.class, intent).create().get();
assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isFalse(); assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isFalse();
} }
@@ -60,8 +60,8 @@ public class HelpTrampolineTest {
final Intent intent = new Intent().setClassName( final Intent intent = new Intent().setClassName(
RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName()) RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName())
.putExtra(Intent.EXTRA_TEXT, "help_url_upgrading"); .putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
final ShadowActivity shadow = shadowOf(Robolectric.buildActivity(HelpTrampoline.class) final ShadowActivity shadow =
.withIntent(intent).create().get()); shadowOf(Robolectric.buildActivity(HelpTrampoline.class, intent).create().get());
final Intent launchedIntent = shadow.getNextStartedActivity(); final Intent launchedIntent = shadow.getNextStartedActivity();
assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isTrue(); assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isTrue();

4
tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
View File

@@ -131,9 +131,7 @@ public class ChooseLockSettingsHelperTest {
public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() { public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() {
Intent intent = new Intent() Intent intent = new Intent()
.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2); .putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
Activity activity = Robolectric.buildActivity(Activity.class) Activity activity = Robolectric.buildActivity(Activity.class, intent).get();
.withIntent(intent)
.get();
ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity); ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */); helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);

8
tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
View File

@@ -62,8 +62,8 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
// By adding any resources from libraries we need the AndroidManifest, we can access // By adding any resources from libraries we need the AndroidManifest, we can access
// them from within the parallel universe's resource loader. // them from within the parallel universe's resource loader.
final AndroidManifest manifest = new AndroidManifest(Fs.fileFromPath(manifestPath), return new AndroidManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resDir),
Fs.fileFromPath(resDir), Fs.fileFromPath(assetsDir)) { Fs.fileFromPath(assetsDir), "com.android.settings") {
@Override @Override
public List<ResourcePath> getIncludedResourcePaths() { public List<ResourcePath> getIncludedResourcePaths() {
List<ResourcePath> paths = super.getIncludedResourcePaths(); List<ResourcePath> paths = super.getIncludedResourcePaths();
@@ -71,10 +71,6 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
return paths; return paths;
} }
}; };
// Set the package name to the renamed one
manifest.setPackageName("com.android.settings");
return manifest;
} }
public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) { public static void getIncludedResourcePaths(String packageName, List<ResourcePath> paths) {