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

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
// them from within the parallel universe's resource loader.
final AndroidManifest manifest = new AndroidManifest(Fs.fileFromPath(manifestPath),
Fs.fileFromPath(resDir), Fs.fileFromPath(assetsDir)) {
return new AndroidManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resDir),
Fs.fileFromPath(assetsDir), "com.android.settings") {
@Override
public List<ResourcePath> getIncludedResourcePaths() {
List<ResourcePath> paths = super.getIncludedResourcePaths();
@@ -71,10 +71,6 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
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) {